jeans/etcher
jeans/etcher
1
0
Fork 0
mirror of https://github.com/balena-io/etcher.git synced 2025-07-21 18:26:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix copying of variables into Docker (#1203)

Browse Source 
Fixes `set -u` errors, and prevents variables being set to undefined values

Change-type: patch
This commit is contained in:
Andrew Scheller 2017-03-23 14:04:31 +00:00 committed by Juan Cruz Viotti
parent fbfd6f0b47
commit a7da396a4c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/build/docker/run-command.sh
View File

@ -77,15 +77,21 @@ then
ARGV_SOURCE_CODE_DIRECTORY="$PWD" ARGV_SOURCE_CODE_DIRECTORY="$PWD"
fi fi
# Fairly ugly code that only passes environment variables into Docker when they're actually set
# see http://stackoverflow.com/a/13864829
# and http://mywiki.wooledge.org/BashFAQ/050
# and http://stackoverflow.com/a/7577209
DOCKER_ENVVARS=()
for COPYVAR in AWS_ACCESS_KEY_ID AWS_SECRET_ACCESS_KEY RELEASE_TYPE CI; do
eval "if [ ! -z \${$COPYVAR+x} ]; then DOCKER_ENVVARS+=(\"--env\" \"$COPYVAR=\$$COPYVAR\"); fi"
done
# The SYS_ADMIN capability and FUSE host device declarations # The SYS_ADMIN capability and FUSE host device declarations
# are needed to be able to build an AppImage # are needed to be able to build an AppImage
# The `-t` and TERM setup is needed to display coloured output. # The `-t` and TERM setup is needed to display coloured output.
docker run -t \ docker run -t \
--env "TERM=xterm-256color" \ --env "TERM=xterm-256color" \
--env "AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" \ ${DOCKER_ENVVARS[@]+"${DOCKER_ENVVARS[@]}"} \
--env "AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" \
--env "RELEASE_TYPE=$RELEASE_TYPE" \
--env "CI=$CI" \
--cap-add SYS_ADMIN \ --cap-add SYS_ADMIN \
--device /dev/fuse:/dev/fuse:mrw \ --device /dev/fuse:/dev/fuse:mrw \
--volume "$ARGV_SOURCE_CODE_DIRECTORY:/etcher" \ --volume "$ARGV_SOURCE_CODE_DIRECTORY:/etcher" \