From 43feaa9f8ff783e2e896515d98622e09cee64e4c Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 2 Jul 2022 17:00:34 +0200 Subject: [PATCH 1/2] Dockerfile.e2e: remove redundant INSTALL_BINARY_NAME It's only used in a single place, so may as well just hard-code it Signed-off-by: Sebastiaan van Stijn --- Dockerfile.e2e | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile.e2e b/Dockerfile.e2e index 898196d547..32d2c66149 100644 --- a/Dockerfile.e2e +++ b/Dockerfile.e2e @@ -26,10 +26,9 @@ RUN /download-frozen-image-v2.sh /build \ # See also frozenImages in "testutil/environment/protect.go" (which needs to be updated when adding images to this list) FROM base AS dockercli -ENV INSTALL_BINARY_NAME=dockercli COPY hack/dockerfile/install/install.sh ./install.sh -COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./ -RUN PREFIX=/build ./install.sh $INSTALL_BINARY_NAME +COPY hack/dockerfile/install/dockercli.installer ./ +RUN PREFIX=/build ./install.sh dockercli # TestDockerCLIBuildSuite dependency FROM base AS contrib From e5a1514c6e132d8efbd8254cbe0b7012ce2e4454 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 2 Jul 2022 17:01:57 +0200 Subject: [PATCH 2/2] Dockerfile: update to latest syntax It was pinned to the 1.3 version; removing the minor version to make sure we're on the latest 1.x stable. Signed-off-by: Sebastiaan van Stijn --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index fd157eb049..2f125e1ef3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1 ARG CROSS="false" ARG SYSTEMD="false"