-
Notifications
You must be signed in to change notification settings - Fork 97
Verify docker cli ce #693
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+78
−16
Merged
Verify docker cli ce #693
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,23 +3,26 @@ | |
| set -eux -o pipefail | ||
|
|
||
| main() { | ||
| # Find the remote that points to docker/model-runner. | ||
| local remote | ||
| remote=$(git remote -v | awk '/docker\/model-runner/ && /\(fetch\)/ {print $1; exit}') | ||
|
|
||
| if [ -n "$remote" ]; then | ||
| echo "Fetching tags from $remote (docker/model-runner)..." | ||
| git fetch "$remote" --tags >/dev/null 2>&1 || echo "Warning: Failed to fetch tags from $remote. Continuing with local tags." >&2 | ||
| else | ||
| echo "Warning: No remote found for docker/model-runner, using local tags only" >&2 | ||
| fi | ||
|
|
||
| local cli_version | ||
| cli_version=$(git tag -l --sort=-version:refname "cmd/cli/v*" | head -1 | sed 's|^cmd/cli/||') | ||
| local cli_version="${1:-}" | ||
|
|
||
| # If no version argument provided, try to detect from git tags | ||
| if [ -z "$cli_version" ]; then | ||
| echo "Error: Could not determine CLI version from git tags" >&2 | ||
| exit 1 | ||
| local remote | ||
| remote=$(git remote -v | awk '/docker\/model-runner/ && /\(fetch\)/ {print $1; exit}') | ||
|
|
||
| if [ -n "$remote" ]; then | ||
| echo "Fetching tags from $remote (docker/model-runner)..." | ||
| git fetch "$remote" --tags >/dev/null 2>&1 || echo "Warning: Failed to fetch tags from $remote. Continuing with local tags." >&2 | ||
| else | ||
| echo "Warning: No remote found for docker/model-runner, using local tags only" >&2 | ||
| fi | ||
|
|
||
| cli_version=$(git tag -l --sort=-version:refname "v*" | head -1) | ||
|
|
||
| if [ -z "$cli_version" ]; then | ||
| echo "Error: Could not determine CLI version from git tags. Pass version as argument: $0 <version>" >&2 | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| exit 1 | ||
| fi | ||
| fi | ||
|
|
||
| echo "Testing Docker CE installation with expected CLI version: $cli_version" | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The
git tag -lcommand now looks for tags starting withv*instead ofcmd/cli/v*. This change might be intentional, but it's worth confirming if the tag naming convention for CLI versions has changed or if this broadens the search more than intended. If the intention is to only get CLI versions, the previous pattern was more specific.