Skip to content

Commit

Permalink
Remove template code for runc and containerd
Browse files Browse the repository at this point in the history 
Signed-off-by: Qiang Huang <[email protected]>
  • Loading branch information
@hqhq
hqhq committed Apr 15, 2016
1 parent bc0c882 commit e67c758
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 14 deletions.
6 changes: 4 additions & 2 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.aarch64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.armhf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]

Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.gccgo
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.ppc64le
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.s390x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
Expand Down
6 changes: 4 additions & 2 deletions Dockerfile.simple
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit e67c758

Please sign in to comment.