summaryrefslogtreecommitdiff
path: root/shell-scripts
diff options
context:
space:
mode:
authorMike Vink <mike.vink@stater.nl>2023-05-08 08:58:02 +0200
committerMike Vink <mike.vink@stater.nl>2023-05-08 08:58:14 +0200
commit4574d6632aaf89a294f57ebb6a4f032830a6b9f5 (patch)
treea283685bfdb976d572bf28c6fdebea8b0e4f64f4 /shell-scripts
parent07b55a27482338dca43b7fd8711ac5e5104b819d (diff)
extra mounts fix
Diffstat (limited to 'shell-scripts')
-rwxr-xr-xshell-scripts/terragrunt10
1 files changed, 5 insertions, 5 deletions
diff --git a/shell-scripts/terragrunt b/shell-scripts/terragrunt
index 007ee26..f7ffe70 100755
--- a/shell-scripts/terragrunt
+++ b/shell-scripts/terragrunt
@@ -63,8 +63,8 @@ TERRAGRUNT_EXTRA_MOUNTS=""
for var in $(pass show work/env)
do
case $var in
- TERRAGRUNT_EXTRA_MOUNTS)
- TERRAGRUNT_EXTRA_MOUNTS="$var"
+ TERRAGRUNT_EXTRA_MOUNTS*)
+ TERRAGRUNT_EXTRA_MOUNTS="${var#*=}"
;;
*)
VARIABLES="$VARIABLES$(printf ' -e %s' "$var")"
@@ -86,9 +86,9 @@ WORKDIR="$ENVIRONMENTS/$ENV/$MODULE"
# TODO(mike): how to do concise mode | grep -E '(^.*[#~+-] .*|^[[:punct:]]|Plan)'
# TODO(mike): check expiry of azure directory
-# echo "docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $TERRAGRUNT_EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | grep -E '(^.*[#~+-] .*|^[[:punct:]]|Plan|Enter)'"
+echo "docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $TERRAGRUNT_EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | filter-ansi | grep --line-buffered -E '(^ .*[#~+-] .*|^[[:punct:]]|^Plan.*|^\S.*)'"
if [[ $FULL -eq 0 ]]; then
- docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | filter-ansi | grep --line-buffered -E '(^ .*[#~+-] .*|^[[:punct:]]|^Plan.*|^\S.*)'
+ docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $TERRAGRUNT_EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | filter-ansi | grep --line-buffered -E '(^ .*[#~+-] .*|^[[:punct:]]|^Plan.*|^\S.*)'
else
- docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | filter-ansi
+ docker run --rm -i $TTY $VARIABLES -v $HOME/.terragrunt-cache:/tmp -v $HOME/.azure:/root/.azure -v $HOME/.netrc:/root/.netrc $TERRAGRUNT_EXTRA_MOUNTS -v ${REPO}:${REPO} -w ${WORKDIR} $TERRAGRUNT_CONTAINER terragrunt ${TERRAGRUNT_ARGS[@]} | filter-ansi
fi