From 592cc2defb75dabd6fd377b6182926fc5ab118ab Mon Sep 17 00:00:00 2001 From: Alexander Block Date: Wed, 19 Feb 2020 09:31:22 +0100 Subject: [PATCH] Check for bash existence instead of only mentioning it in a comment --- .../resources/internal-port-check-dockerfile/Dockerfile-bash | 1 - .../resources/internal-port-check-dockerfile/Dockerfile-nc | 4 +++- .../resources/internal-port-check-dockerfile/Dockerfile-tcp | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-bash b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-bash index f62f69b9e3f..a622b3b8ccd 100644 --- a/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-bash +++ b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-bash @@ -1,4 +1,3 @@ -# If you ever upgrade this image, watch out for bash being installed by default in newer alpine base images FROM nginx:1.17-alpine RUN apk add bash diff --git a/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-nc b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-nc index 01ec85d2865..dcf2385cdbd 100644 --- a/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-nc +++ b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-nc @@ -1,6 +1,8 @@ -# If you ever upgrade this image, watch out for bash being installed by default in newer alpine base images FROM nginx:1.17-alpine +# If this fails, you ended up using a base image with bash installed. Consider removing /bin/bash in this case +RUN if bash -c true &> /dev/null; then exit 1; fi + # Make sure the /proc/net/tcp* check fails in this container RUN rm /usr/bin/awk diff --git a/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-tcp b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-tcp index 9e5e9ad866c..37073ec106a 100644 --- a/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-tcp +++ b/core/src/test/resources/internal-port-check-dockerfile/Dockerfile-tcp @@ -1,6 +1,8 @@ -# If you ever upgrade this image, watch out for bash being installed by default in newer alpine base images FROM nginx:1.17-alpine +# If this fails, you ended up using a base image with bash installed. Consider removing /bin/bash in this case +RUN if bash -c true &> /dev/null; then exit 1; fi + # Make sure the nc check fails in this container RUN rm /usr/bin/nc