docker-library
/
bashbrew
mirror of https://github.com/docker-library/bashbrew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move "bashbrew-arch-to-goenv.sh" into a scripts subdirectory

This commit is contained in:
Tianon Gravi 2020-04-24 11:39:12 -07:00
parent 7a318e4b33
commit 6ccbd0a7f2
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.dockerignore
View File

@ -1,5 +1,5 @@
** **
!.bashbrew-arch-to-goenv.sh
!go/go.* !go/go.*
!go/src/ !go/src/
!go/vendor/ !go/vendor/
!scripts/bashbrew-arch-to-goenv.sh

6
Dockerfile.release
View File

@ -20,7 +20,7 @@ ENV BASHBREW_ARCHES \
s390x \ s390x \
windows-amd64 windows-amd64
COPY .bashbrew-arch-to-goenv.sh /usr/local/bin/ COPY scripts/bashbrew-arch-to-goenv.sh /usr/local/bin/
# https://github.com/estesp/manifest-tool/releases # https://github.com/estesp/manifest-tool/releases
ENV MANIFEST_TOOL_VERSION 1.0.2 ENV MANIFEST_TOOL_VERSION 1.0.2
@ -36,7 +36,7 @@ RUN set -euxo pipefail; \
\ \
for bashbrewArch in $BASHBREW_ARCHES; do \ for bashbrewArch in $BASHBREW_ARCHES; do \
( \ ( \
goEnv="$(.bashbrew-arch-to-goenv.sh "$bashbrewArch")"; eval "$goEnv"; \ goEnv="$(bashbrew-arch-to-goenv.sh "$bashbrewArch")"; eval "$goEnv"; \
srcBin="manifest-tool-$GOOS-$GOARCH"; \ srcBin="manifest-tool-$GOOS-$GOARCH"; \
if [ "$GOARCH" = 'arm' ]; then [ -n "$GOARM" ]; srcBin="${srcBin}v$GOARM"; fi; \ if [ "$GOARCH" = 'arm' ]; then [ -n "$GOARM" ]; srcBin="${srcBin}v$GOARM"; fi; \
[ "$GOOS" = 'windows' ] && ext='.exe' || ext=; \ [ "$GOOS" = 'windows' ] && ext='.exe' || ext=; \
@ -64,7 +64,7 @@ RUN set -euxo pipefail; \
\ \
for bashbrewArch in $BASHBREW_ARCHES; do \ for bashbrewArch in $BASHBREW_ARCHES; do \
( \ ( \
goEnv="$(.bashbrew-arch-to-goenv.sh "$bashbrewArch")"; eval "$goEnv"; \ goEnv="$(bashbrew-arch-to-goenv.sh "$bashbrewArch")"; eval "$goEnv"; \
[ "$GOOS" = 'windows' ] && ext='.exe' || ext=; \ [ "$GOOS" = 'windows' ] && ext='.exe' || ext=; \
\ \
targetBin="bin/bashbrew-$bashbrewArch$ext"; \ targetBin="bin/bashbrew-$bashbrewArch$ext"; \

0
.bashbrew-arch-to-goenv.sh → scripts/bashbrew-arch-to-goenv.sh
View File