فهرست منبع

Remove lib copies

Manjunath A Kumatagi 7 سال پیش
والد
کامیت
106c4ea98c
4فایلهای تغییر یافته به همراه2 افزوده شده و 15 حذف شده
  1. 1 5
      Dockerfile.arm
  2. 1 4
      Dockerfile.arm64
  3. 0 3
      Dockerfile.ppc64le
  4. 0 3
      Dockerfile.s390x

+ 1 - 5
Dockerfile.arm

@@ -1,4 +1,4 @@
-FROM armel/busybox:glibc
+FROM arm32v7/busybox:glibc
 
 MAINTAINER Tom Denham <tom@tigera.io>
 
@@ -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"]

+ 1 - 4
Dockerfile.arm64

@@ -1,4 +1,4 @@
-FROM aarch64/busybox:glibc
+FROM arm64v8/busybox:glibc
 
 MAINTAINER Tom Denham <tom@tigera.io>
 
@@ -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"]

+ 0 - 3
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"]

+ 0 - 3
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"]