Skip to content

Commit

Permalink
Merge pull request #811 from mkumatag/dockerfiles
Browse files Browse the repository at this point in the history 
Remove Library copy commands from dockefiles
  • Loading branch information
@tomdee
tomdee authored Sep 15, 2017
2 parents c1b6a06 + 106c4ea commit 6aab545
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 15 deletions.
6 changes: 1 addition & 5 deletions Dockerfile.arm
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM armel/busybox:glibc
FROM arm32v7/busybox:glibc

MAINTAINER Tom Denham <[email protected]>

Expand All @@ -7,9 +7,5 @@ ENV FLANNEL_ARCH=arm
COPY dist/flanneld-$FLANNEL_ARCH /opt/bin/flanneld
COPY dist/iptables-$FLANNEL_ARCH /usr/local/bin/iptables
COPY dist/mk-docker-opts.sh /opt/bin/
COPY dist/libpthread.so.0-$FLANNEL_ARCH /lib/libpthread.so.0
COPY dist/ld64.so.1-$FLANNEL_ARCH /lib/ld64.so.1
COPY dist/libc.so.6-$FLANNEL_ARCH /lib/libc.so.6


ENTRYPOINT ["/opt/bin/flanneld"]
5 changes: 1 addition & 4 deletions Dockerfile.arm64
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM aarch64/busybox:glibc
FROM arm64v8/busybox:glibc

MAINTAINER Tom Denham <[email protected]>

Expand All @@ -7,8 +7,5 @@ ENV FLANNEL_ARCH=arm64
COPY dist/flanneld-$FLANNEL_ARCH /opt/bin/flanneld
COPY dist/iptables-$FLANNEL_ARCH /usr/local/bin/iptables
COPY dist/mk-docker-opts.sh /opt/bin/
COPY dist/libpthread.so.0-$FLANNEL_ARCH /lib/libpthread.so.0
COPY dist/ld64.so.1-$FLANNEL_ARCH /lib/ld64.so.1
COPY dist/libc.so.6-$FLANNEL_ARCH /lib/libc.so.6

ENTRYPOINT ["/opt/bin/flanneld"]
3 changes: 0 additions & 3 deletions Dockerfile.ppc64le
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@ ENV FLANNEL_ARCH=ppc64le
COPY dist/flanneld-$FLANNEL_ARCH /opt/bin/flanneld
COPY dist/iptables-$FLANNEL_ARCH /usr/local/bin/iptables
COPY dist/mk-docker-opts.sh /opt/bin/
COPY dist/libpthread.so.0-$FLANNEL_ARCH /lib/libpthread.so.0
COPY dist/ld64.so.1-$FLANNEL_ARCH /lib/ld64.so.1
COPY dist/libc.so.6-$FLANNEL_ARCH /lib/libc.so.6

ENTRYPOINT ["/opt/bin/flanneld"]
3 changes: 0 additions & 3 deletions Dockerfile.s390x
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,5 @@ ENV FLANNEL_ARCH=s390x
COPY dist/flanneld-$FLANNEL_ARCH /opt/bin/flanneld
COPY dist/iptables-$FLANNEL_ARCH /usr/local/bin/iptables
COPY dist/mk-docker-opts.sh /opt/bin/
COPY dist/libpthread.so.0-$FLANNEL_ARCH /lib/libpthread.so.0
COPY dist/ld64.so.1-$FLANNEL_ARCH /lib/ld64.so.1
COPY dist/libc.so.6-$FLANNEL_ARCH /lib/libc.so.6

ENTRYPOINT ["/opt/bin/flanneld"]

0 comments on commit 6aab545

Please sign in to comment.