1. docker
  2. Commit e67c758ec373745300317786a27d639082a3d18d
Browse code

Remove template code for runc and containerd

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>

Qiang Huang authored on 2016/04/15 13:45:35
Showing 7 changed files
Dockerfile
History View file @ e67c758
... ... 
@@ -255,7 +255,8 @@ RUN set -x \
255 255 
 	&& cd "$GOPATH/src/github.com/opencontainers/runc" \
256 256 
 	&& git checkout -q "$RUNC_COMMIT" \
257 257 
 	&& make static BUILDTAGS="seccomp apparmor selinux" \
258 
-	&& cp runc /usr/local/bin/docker-runc
258 
+	&& cp runc /usr/local/bin/docker-runc \
259 
+	&& rm -rf "$GOPATH"
259 260
260 261 
 # Install containerd
261 262 
 ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d
... ... 
@@ -267,7 +268,8 @@ RUN set -x \
267 267 
 	&& make static \
268 268 
 	&& cp bin/containerd /usr/local/bin/docker-containerd \
269 269 
 	&& cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \
270 
-	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr
270 
+	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr \
271 
+	&& rm -rf "$GOPATH"
271 272
272 273 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
273 274 
 ENTRYPOINT ["hack/dind"]
Dockerfile.aarch64
History View file @ e67c758
... ... 
@@ -188,7 +188,8 @@ RUN set -x \
188 188 
 	&& cd "$GOPATH/src/github.com/opencontainers/runc" \
189 189 
 	&& git checkout -q "$RUNC_COMMIT" \
190 190 
 	&& make static BUILDTAGS="seccomp apparmor selinux" \
191 
-	&& cp runc /usr/local/bin/docker-runc
191 
+	&& cp runc /usr/local/bin/docker-runc \
192 
+	&& rm -rf "$GOPATH"
192 193
193 194 
 # Install containerd
194 195 
 ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d
... ... 
@@ -200,7 +201,8 @@ RUN set -x \
200 200 
 	&& make static \
201 201 
 	&& cp bin/containerd /usr/local/bin/docker-containerd \
202 202 
 	&& cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \
203 
-	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr
203 
+	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr \
204 
+	&& rm -rf "$GOPATH"
204 205
205 206 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
206 207 
 ENTRYPOINT ["hack/dind"]
Dockerfile.armhf
History View file @ e67c758
... ... 
@@ -207,7 +207,8 @@ RUN set -x \
207 207 
 	&& cd "$GOPATH/src/github.com/opencontainers/runc" \
208 208 
 	&& git checkout -q "$RUNC_COMMIT" \
209 209 
 	&& make static BUILDTAGS="seccomp apparmor selinux" \
210 
-	&& cp runc /usr/local/bin/docker-runc
210 
+	&& cp runc /usr/local/bin/docker-runc \
211 
+	&& rm -rf "$GOPATH"
211 212
212 213 
 # Install containerd
213 214 
 ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d
... ... 
@@ -219,7 +220,8 @@ RUN set -x \
219 219 
 	&& make static \
220 220 
 	&& cp bin/containerd /usr/local/bin/docker-containerd \
221 221 
 	&& cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \
222 
-	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr
222 
+	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr \
223 
+	&& rm -rf "$GOPATH"
223 224
224 225 
 ENTRYPOINT ["hack/dind"]
225 226
Dockerfile.gccgo
History View file @ e67c758
... ... 
@@ -81,7 +81,8 @@ RUN set -x \
81 81 
 	&& cd "$GOPATH/src/github.com/opencontainers/runc" \
82 82 
 	&& git checkout -q "$RUNC_COMMIT" \
83 83 
 	&& make static BUILDTAGS="seccomp apparmor selinux" \
84 
-	&& cp runc /usr/local/bin/docker-runc
84 
+	&& cp runc /usr/local/bin/docker-runc \
85 
+	&& rm -rf "$GOPATH"
85 86
86 87 
 # Install containerd
87 88 
 ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d
... ... 
@@ -93,7 +94,8 @@ RUN set -x \
93 93 
 	&& make static \
94 94 
 	&& cp bin/containerd /usr/local/bin/docker-containerd \
95 95 
 	&& cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \
96 
-	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr
96 
+	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr \
97 
+	&& rm -rf "$GOPATH"
97 98
98 99 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
99 100 
 ENTRYPOINT ["hack/dind"]
Dockerfile.ppc64le
History View file @ e67c758
... ... 
@@ -203,7 +203,8 @@ RUN set -x \
203 203 
 	&& cd "$GOPATH/src/github.com/opencontainers/runc" \
204 204 
 	&& git checkout -q "$RUNC_COMMIT" \
205 205 
 	&& make static BUILDTAGS="apparmor selinux" \
206 
-	&& cp runc /usr/local/bin/docker-runc
206 
+	&& cp runc /usr/local/bin/docker-runc \
207 
+	&& rm -rf "$GOPATH"
207 208
208 209 
 # Install containerd
209 210 
 ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d
... ... 
@@ -215,7 +216,8 @@ RUN set -x \
215 215 
 	&& make static \
216 216 
 	&& cp bin/containerd /usr/local/bin/docker-containerd \
217 217 
 	&& cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \
218 
-	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr
218 
+	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr \
219 
+	&& rm -rf "$GOPATH"
219 220
220 221 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
221 222 
 ENTRYPOINT ["hack/dind"]
Dockerfile.s390x
History View file @ e67c758
... ... 
@@ -185,7 +185,8 @@ RUN set -x \
185 185 
 	&& cd "$GOPATH/src/github.com/opencontainers/runc" \
186 186 
 	&& git checkout -q "$RUNC_COMMIT" \
187 187 
 	&& make static BUILDTAGS="seccomp apparmor selinux" \
188 
-	&& cp runc /usr/local/bin/docker-runc
188 
+	&& cp runc /usr/local/bin/docker-runc \
189 
+	&& rm -rf "$GOPATH"
189 190
190 191 
 # Install containerd
191 192 
 ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d
... ... 
@@ -197,7 +198,8 @@ RUN set -x \
197 197 
 	&& make static \
198 198 
 	&& cp bin/containerd /usr/local/bin/docker-containerd \
199 199 
 	&& cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \
200 
-	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr
200 
+	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr \
201 
+	&& rm -rf "$GOPATH"
201 202
202 203 
 # Wrap all commands in the "docker-in-docker" script to allow nested containers
203 204 
 ENTRYPOINT ["hack/dind"]
Dockerfile.simple
History View file @ e67c758
... ... 
@@ -64,7 +64,8 @@ RUN set -x \
64 64 
 	&& cd "$GOPATH/src/github.com/opencontainers/runc" \
65 65 
 	&& git checkout -q "$RUNC_COMMIT" \
66 66 
 	&& make static BUILDTAGS="seccomp apparmor selinux" \
67 
-	&& cp runc /usr/local/bin/docker-runc
67 
+	&& cp runc /usr/local/bin/docker-runc \
68 
+	&& rm -rf "$GOPATH"
68 69
69 70 
 # Install containerd
70 71 
 ENV CONTAINERD_COMMIT 07c95162cdcead88dfe4ca0ffb3cea02375ec54d
... ... 
@@ -76,7 +77,8 @@ RUN set -x \
76 76 
 	&& make static \
77 77 
 	&& cp bin/containerd /usr/local/bin/docker-containerd \
78 78 
 	&& cp bin/containerd-shim /usr/local/bin/docker-containerd-shim \
79 
-	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr
79 
+	&& cp bin/ctr /usr/local/bin/docker-containerd-ctr \
80 
+	&& rm -rf "$GOPATH"
80 81
81 82 
 ENV AUTO_GOPATH 1
82 83 
 WORKDIR /usr/src/docker