diff options
author | Qiang Huang <h.huangqiang@huawei.com> | 2016-04-15 12:45:35 +0800 |
---|---|---|
committer | Qiang Huang <h.huangqiang@huawei.com> | 2016-04-15 12:45:35 +0800 |
commit | e67c758ec373745300317786a27d639082a3d18d (patch) | |
tree | fc6ae4cc655d61b2b4d75cc7359ec9b4773d9d06 | |
parent | bc0c8828e9afc32f1660a1f679ed523376c7d3d2 (diff) | |
download | docker-e67c758ec373745300317786a27d639082a3d18d.tar.gz |
Remove template code for runc and containerd
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
-rw-r--r-- | Dockerfile | 6 | ||||
-rw-r--r-- | Dockerfile.aarch64 | 6 | ||||
-rw-r--r-- | Dockerfile.armhf | 6 | ||||
-rw-r--r-- | Dockerfile.gccgo | 6 | ||||
-rw-r--r-- | Dockerfile.ppc64le | 6 | ||||
-rw-r--r-- | Dockerfile.s390x | 6 | ||||
-rw-r--r-- | Dockerfile.simple | 6 |
7 files changed, 28 insertions, 14 deletions
diff --git a/Dockerfile b/Dockerfile index 05914856f4..e0fb59c778 100644 --- a/Dockerfile +++ b/Dockerfile @@ -255,7 +255,8 @@ RUN set -x \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ - && cp runc /usr/local/bin/docker-runc + && cp runc /usr/local/bin/docker-runc \ + && rm -rf "$GOPATH" # Install containerd ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d @@ -267,7 +268,8 @@ RUN set -x \ && make static \ && cp bin/containerd /usr/local/bin/docker-containerd \ && cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \ - && cp bin/ctr /usr/local/bin/docker-containerd-ctr + && cp bin/ctr /usr/local/bin/docker-containerd-ctr \ + && rm -rf "$GOPATH" # Wrap all commands in the "docker-in-docker" script to allow nested containers ENTRYPOINT ["hack/dind"] diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 14c5c6c102..52045c08a1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -188,7 +188,8 @@ RUN set -x \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ - && cp runc /usr/local/bin/docker-runc + && cp runc /usr/local/bin/docker-runc \ + && rm -rf "$GOPATH" # Install containerd ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d @@ -200,7 +201,8 @@ RUN set -x \ && make static \ && cp bin/containerd /usr/local/bin/docker-containerd \ && cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \ - && cp bin/ctr /usr/local/bin/docker-containerd-ctr + && cp bin/ctr /usr/local/bin/docker-containerd-ctr \ + && rm -rf "$GOPATH" # Wrap all commands in the "docker-in-docker" script to allow nested containers ENTRYPOINT ["hack/dind"] diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 6def686d3d..1a77c80d84 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -207,7 +207,8 @@ RUN set -x \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ - && cp runc /usr/local/bin/docker-runc + && cp runc /usr/local/bin/docker-runc \ + && rm -rf "$GOPATH" # Install containerd ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d @@ -219,7 +220,8 @@ RUN set -x \ && make static \ && cp bin/containerd /usr/local/bin/docker-containerd \ && cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \ - && cp bin/ctr /usr/local/bin/docker-containerd-ctr + && cp bin/ctr /usr/local/bin/docker-containerd-ctr \ + && rm -rf "$GOPATH" ENTRYPOINT ["hack/dind"] diff --git a/Dockerfile.gccgo b/Dockerfile.gccgo index 8a6994af05..8b544ded4b 100644 --- a/Dockerfile.gccgo +++ b/Dockerfile.gccgo @@ -81,7 +81,8 @@ RUN set -x \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ - && cp runc /usr/local/bin/docker-runc + && cp runc /usr/local/bin/docker-runc \ + && rm -rf "$GOPATH" # Install containerd ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d @@ -93,7 +94,8 @@ RUN set -x \ && make static \ && cp bin/containerd /usr/local/bin/docker-containerd \ && cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \ - && cp bin/ctr /usr/local/bin/docker-containerd-ctr + && cp bin/ctr /usr/local/bin/docker-containerd-ctr \ + && rm -rf "$GOPATH" # Wrap all commands in the "docker-in-docker" script to allow nested containers ENTRYPOINT ["hack/dind"] diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index 0f2e809053..325bbdd90c 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -203,7 +203,8 @@ RUN set -x \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="apparmor selinux" \ - && cp runc /usr/local/bin/docker-runc + && cp runc /usr/local/bin/docker-runc \ + && rm -rf "$GOPATH" # Install containerd ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d @@ -215,7 +216,8 @@ RUN set -x \ && make static \ && cp bin/containerd /usr/local/bin/docker-containerd \ && cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \ - && cp bin/ctr /usr/local/bin/docker-containerd-ctr + && cp bin/ctr /usr/local/bin/docker-containerd-ctr \ + && rm -rf "$GOPATH" # Wrap all commands in the "docker-in-docker" script to allow nested containers ENTRYPOINT ["hack/dind"] diff --git a/Dockerfile.s390x b/Dockerfile.s390x index a9823084ad..40908f5b19 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -185,7 +185,8 @@ RUN set -x \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ - && cp runc /usr/local/bin/docker-runc + && cp runc /usr/local/bin/docker-runc \ + && rm -rf "$GOPATH" # Install containerd ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d @@ -197,7 +198,8 @@ RUN set -x \ && make static \ && cp bin/containerd /usr/local/bin/docker-containerd \ && cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \ - && cp bin/ctr /usr/local/bin/docker-containerd-ctr + && cp bin/ctr /usr/local/bin/docker-containerd-ctr \ + && rm -rf "$GOPATH" # Wrap all commands in the "docker-in-docker" script to allow nested containers ENTRYPOINT ["hack/dind"] diff --git a/Dockerfile.simple b/Dockerfile.simple index c8f9d8f227..67a168d938 100644 --- a/Dockerfile.simple +++ b/Dockerfile.simple @@ -64,7 +64,8 @@ RUN set -x \ && cd "$GOPATH/src/github.com/opencontainers/runc" \ && git checkout -q "$RUNC_COMMIT" \ && make static BUILDTAGS="seccomp apparmor selinux" \ - && cp runc /usr/local/bin/docker-runc + && cp runc /usr/local/bin/docker-runc \ + && rm -rf "$GOPATH" # Install containerd ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d @@ -76,7 +77,8 @@ RUN set -x \ && make static \ && cp bin/containerd /usr/local/bin/docker-containerd \ && cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \ - && cp bin/ctr /usr/local/bin/docker-containerd-ctr + && cp bin/ctr /usr/local/bin/docker-containerd-ctr \ + && rm -rf "$GOPATH" ENV AUTO_GOPATH 1 WORKDIR /usr/src/docker |