Improve logging of docker versions and relay creds #1298
Merged
Conversation
This file contains 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
chadwhitacre
force-pushed
the
cwlw/improve-logging
branch
from
2efc391
to
61be19c
Compare
chadwhitacre
commented
Feb 4, 2022
| exit 1 | ||
| fi | ||
| # See https://github.com/getsentry/self-hosted/issues/1132#issuecomment-982823712 ff. for regex testing. | ||
| COMPOSE_VERSION=$($dc_base version | head -n1 | sed -E 's/^.* version:? v?([0-9.]+),?.*$/\1/') |
There was a problem hiding this comment.
Updating this to work with already-defined dc_base rather than duplicating the logic in dc-detect-version here.
chadwhitacre
commented
Feb 4, 2022
| @@ -7,22 +7,18 @@ function ver () { echo "$@" | awk -F. '{ printf("%d%03d%03d", $1,$2,$3); }'; } | |||
|
|
|||
| DOCKER_VERSION=$(docker version --format '{{.Server.Version}}') | |||
| if [[ "$(ver $DOCKER_VERSION)" -lt "$(ver $MIN_DOCKER_VERSION)" ]]; then | |||
| echo "FAIL: Expected minimum Docker version to be $MIN_DOCKER_VERSION but found $DOCKER_VERSION" | |||
| echo "FAIL: Expected minimum docker version to be $MIN_DOCKER_VERSION but found $DOCKER_VERSION" | |||
There was a problem hiding this comment.
Match casing we're gonna get from $dc_base below.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Towards #1297.