install: Default to staging repo file for staging download URL #480
Conversation
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
Contributor
Author
|
@thaJeztah PTAL |
thaJeztah
requested changes
Apr 17, 2025
Member
thaJeztah
left a comment
thaJeztah
left a comment
There was a problem hiding this comment.
Left a comment (at least the tab <--> spaces should be fixed 😄 )
install.sh
Outdated
Comment on lines
102
to
110
| DEFAULT_STAGING_REPO_FILE="docker-ce-staging.repo" | ||
|
|
||
| if [ -z "$REPO_FILE" ]; then | ||
| REPO_FILE="$DEFAULT_REPO_FILE" | ||
| # Automatically default to a staging repo fora | ||
| # a staging download url (download-stage.docker.com) | ||
| case "$DOWNLOAD_URL" in | ||
| *-stage*) REPO_FILE="$DEFAULT_STAGING_REPO_FILE";; | ||
| esac |
Member
There was a problem hiding this comment.
Looks like the new lines accidentally used spaces for indentation (I thought we had shfmt running in this repo, but looks like we don't? (we should add it).
Suggested change
| DEFAULT_STAGING_REPO_FILE="docker-ce-staging.repo" | |
| if [ -z "$REPO_FILE" ]; then | |
| REPO_FILE="$DEFAULT_REPO_FILE" | |
| # Automatically default to a staging repo fora | |
| # a staging download url (download-stage.docker.com) | |
| case "$DOWNLOAD_URL" in | |
| *-stage*) REPO_FILE="$DEFAULT_STAGING_REPO_FILE";; | |
| esac | |
| DEFAULT_STAGING_REPO_FILE="docker-ce-staging.repo" | |
| if [ -z "$REPO_FILE" ]; then | |
| REPO_FILE="$DEFAULT_REPO_FILE" | |
| # Automatically default to a staging repo for | |
| # a staging download url (download-stage.docker.com) | |
| case "$DOWNLOAD_URL" in | |
| *-stage*) REPO_FILE="$DEFAULT_STAGING_REPO_FILE";; | |
| esac |
One thing I was looking at, but we already have some cases where we did, was to keep "internal" vars lowercase, so that it's slightly more clear which env-vars we expect users to be using for overrides. (We can't use local because that's not a POSIX thing).
Suggested change
| DEFAULT_STAGING_REPO_FILE="docker-ce-staging.repo" | |
| if [ -z "$REPO_FILE" ]; then | |
| REPO_FILE="$DEFAULT_REPO_FILE" | |
| # Automatically default to a staging repo fora | |
| # a staging download url (download-stage.docker.com) | |
| case "$DOWNLOAD_URL" in | |
| *-stage*) REPO_FILE="$DEFAULT_STAGING_REPO_FILE";; | |
| esac | |
| default_staging_repo_file="docker-ce-staging.repo" | |
| if [ -z "$REPO_FILE" ]; then | |
| REPO_FILE="$DEFAULT_REPO_FILE" | |
| # Automatically default to a staging repo for | |
| # a staging download url (download-stage.docker.com) | |
| case "$DOWNLOAD_URL" in | |
| *-stage*) REPO_FILE="$default_staging_repo_file";; | |
| esac |
Or ... we could keep it simple, because we don't use that var anywhere else;
Suggested change
| DEFAULT_STAGING_REPO_FILE="docker-ce-staging.repo" | |
| if [ -z "$REPO_FILE" ]; then | |
| REPO_FILE="$DEFAULT_REPO_FILE" | |
| # Automatically default to a staging repo fora | |
| # a staging download url (download-stage.docker.com) | |
| case "$DOWNLOAD_URL" in | |
| *-stage*) REPO_FILE="$DEFAULT_STAGING_REPO_FILE";; | |
| esac | |
| if [ -z "$REPO_FILE" ]; then | |
| REPO_FILE="$DEFAULT_REPO_FILE" | |
| # Automatically default to a staging repo for | |
| # a staging download url (download-stage.docker.com) | |
| case "$DOWNLOAD_URL" in | |
| *-stage*) REPO_FILE="docker-ce-staging.repo";; | |
| esac |
Member
There was a problem hiding this comment.
OH! There's a typo as well (fora -> for)
When using a staging download URL (containing "-stage" in the URL), and no explicit repo was provided automatically use the staging repo file as well. So it's sufficient to do: ``` curl -L get.docker.com | DOWNLOAD_URL="https://download-stage.docker.com" sh - ``` instead of ``` curl -L get.docker.com | REPO_FILE="docker-ce-staging.repo" DOWNLOAD_URL="https://download-stage.docker.com" sh - ``` Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
When using a staging download URL (containing "-stage" in the URL), and no explicit repo was provided automatically use the staging repo file as well.
(This only affects DNF distros)
So it's sufficient to do:
instead of
Signed-off-by: Paweł Gronowski pawel.gronowski@docker.com