From 106c4ea98cb8f3aafa795cf0879c098fbafc78fb Mon Sep 17 00:00:00 2001 From: Manjunath A Kumatagi Date: Thu, 14 Sep 2017 04:57:17 -0400 Subject: [PATCH] Remove lib copies --- Dockerfile.arm | 6 +----- Dockerfile.arm64 | 5 +---- Dockerfile.ppc64le | 3 --- Dockerfile.s390x | 3 --- 4 files changed, 2 insertions(+), 15 deletions(-) diff --git a/Dockerfile.arm b/Dockerfile.arm index 0962e5a1a3..06e2d8db32 100644 --- a/Dockerfile.arm +++ b/Dockerfile.arm @@ -1,4 +1,4 @@ -FROM armel/busybox:glibc +FROM arm32v7/busybox:glibc MAINTAINER Tom Denham @@ -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"] diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 9fa8e0bfad..1de00fc145 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,4 +1,4 @@ -FROM aarch64/busybox:glibc +FROM arm64v8/busybox:glibc MAINTAINER Tom Denham @@ -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"] diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le index e28c53ea1d..98225e5210 100644 --- a/Dockerfile.ppc64le +++ b/Dockerfile.ppc64le @@ -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"] diff --git a/Dockerfile.s390x b/Dockerfile.s390x index b5858155a3..234bcd1371 100644 --- a/Dockerfile.s390x +++ b/Dockerfile.s390x @@ -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"]