From f5acd1dee96be033c0c7d34ce632c037b00f0b09 Mon Sep 17 00:00:00 2001 From: scito Date: Sun, 1 Jan 2023 17:56:06 +0100 Subject: [PATCH] test docker locally after build, easier to reproduce --- upgrade_deps.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/upgrade_deps.sh b/upgrade_deps.sh index 26bc02b..e75d827 100755 --- a/upgrade_deps.sh +++ b/upgrade_deps.sh @@ -307,7 +307,8 @@ TOTAL_COVERAGE=$(cat $COVERAGE_OUT | grep 'TOTAL' | perl -ne 'print "$&" if /\b( if $build_docker; then # Build docker - cmd="docker build . -t extract_otp_secrets_only_txt -f Dockerfile_only_txt --pull" + # Build Dockerfile_only_txt (Alpine) + cmd="docker build . -t extract_otp_secrets_only_txt -f Dockerfile_only_txt --pull --build-arg RUN_TESTS=false" if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi eval "$cmd" @@ -323,7 +324,8 @@ if $build_docker; then if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi eval "$cmd" - cmd="docker build . -t extract_otp_secrets --pull" + # Build extract_otp_secrets (Debian) + cmd="docker build . -t extract_otp_secrets --pull --build-arg RUN_TESTS=false" if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi eval "$cmd" @@ -339,7 +341,7 @@ if $build_docker; then if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi eval "$cmd" - cmd="docker image prune || echo 'No docker image pruning'" + cmd="docker image prune -f || echo 'No docker image pruned'" if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi eval "$cmd" fi