dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-12 22:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #43763 from thaJeztah/cleanup_e2e

Browse Source 
Dockerfile: remove redundant variable, and upgrade to latest 1.x stable syntax
This commit is contained in:
Sebastiaan van Stijn
2022-07-02 19:55:19 +02:00
committed by GitHub
parent 2e16286575 e5a1514c6e
commit abaf69481f
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

@@ -1,4 +1,4 @@
# syntax=docker/dockerfile:1.3
# syntax=docker/dockerfile:1
ARG CROSS="false"
ARG SYSTEMD="false"

5
Dockerfile.e2e
View File

@@ -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