diff --git a/Dockerfile b/Dockerfile index aa8f6551b1..81a0986dff 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax=docker/dockerfile:1.3 +# syntax=docker/dockerfile:1 ARG CROSS="false" ARG SYSTEMD="false" 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