-
Notifications
You must be signed in to change notification settings - Fork 250
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
tools: fix incompatibilities between normal and alpine sh (#649)
`sh` (as executed by Alpine) understands `set -o pipefail`, but other installations of sh do not. This commit partially reverts the change from #640 so that the scripts expect bash, and that our usage of alpine installs bash before executing the tools/image-tag-docker script.
- Loading branch information
Showing
4 changed files
with
10 additions
and
10 deletions.
There are no files selected for viewing
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#!/usr/bin/env sh | ||
#!/usr/bin/env bash | ||
# | ||
# image-tag determines which version to embed into a built image. | ||
# | ||
|
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
#!/usr/bin/env sh | ||
#!/usr/bin/env bash | ||
# | ||
# image-tag-docker runs ./tools/image-tag but sanitizes invalid characters | ||
# for use in Docker image tags. | ||
|
||
TAG=$(sh ./tools/image-tag) | ||
TAG=$(/usr/bin/env bash ./tools/image-tag) | ||
echo ${TAG//+/-} |