toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35454 from cpuguy83/move_env_declaration

Browse Source 
COPY should be the last op in the Dockerfile
Upstream-commit: 45e9630b48b99ab86a88dd9a593604810b8400b6
Component: engine
This commit is contained in:
Akihiro Suda
2017-11-10 10:17:21 +09:00
committed by GitHub
parent 2bb50cbf78 366ab9966c
commit 8d5384d97c
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/Dockerfile
+3 -2
View File
@@ -189,8 +189,9 @@ RUN ln -s /usr/local/completion/bash/docker /etc/bash_completion.d/docker
# Wrap all commands in the "docker-in-docker" script to allow nested containers
ENTRYPOINT ["hack/dind"]
# Options for hack/validate/gometalinter
ENV GOMETALINTER_OPTS="--deadline 2m"
# Upload docker source
COPY . /go/src/github.com/docker/docker
# Options for hack/validate/gometalinter
ENV GOMETALINTER_OPTS="--deadline 2m"
components/engine/Dockerfile.aarch64
+3 -3
View File
@@ -158,8 +158,8 @@ ENV PATH=/usr/local/cli:$PATH
# Wrap all commands in the "docker-in-docker" script to allow nested containers
ENTRYPOINT ["hack/dind"]
# Upload docker source
COPY . /go/src/github.com/docker/docker
# Options for hack/validate/gometalinter
ENV GOMETALINTER_OPTS="--deadline 4m -j2"
# Upload docker source
COPY . /go/src/github.com/docker/docker
components/engine/Dockerfile.armhf
+3 -3
View File
@@ -146,8 +146,8 @@ ENV PATH=/usr/local/cli:$PATH
ENTRYPOINT ["hack/dind"]
# Upload docker source
COPY . /go/src/github.com/docker/docker
# Options for hack/validate/gometalinter
ENV GOMETALINTER_OPTS="--deadline 10m -j2"
# Upload docker source
COPY . /go/src/github.com/docker/docker