Merge pull request #1114 from tomdee/calico/felix-fixes

Calico/felix image fixes

Dockerfile

@@ -2,12 +2,14 @@ FROM alpine:3.4
 MAINTAINER Tom Denham <tom@projectcalico.org>
 
 # Download and install glibc in one layer
-RUN apk --no-cache add wget ca-certificates && \
+RUN apk --no-cache add wget ca-certificates libgcc && \
     wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://raw.githubusercontent.com/sgerrand/alpine-pkg-glibc/master/sgerrand.rsa.pub && \
     wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-2.23-r3.apk && \
-    apk add glibc-2.23-r3.apk && \
+    wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.23-r3/glibc-bin-2.23-r3.apk && \
+    apk add glibc-2.23-r3.apk glibc-bin-2.23-r3.apk && \
+    /usr/glibc-compat/sbin/ldconfig /lib /usr/glibc/usr/lib && \
     apk del wget ca-certificates && \
-    rm -f glibc-2.23-r3.apk
+    rm -f glibc-2.23-r3.apk glibc-bin-2.23-r3.apk
 
 RUN apk --no-cache add ip6tables ipset iputils iproute2 conntrack-tools 
 

docker_build_and_run.sh

@@ -12,8 +12,5 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-docker build -t calico/felix -f Dockerfile \
-	--build-arg VCS_URL=`git config --get remote.origin.url` \
-	--build-arg VCS_REF=`git rev-parse --short HEAD` \
-	--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` .
-docker run --privileged --net=host -ti --rm calico/felix calico-felix
+docker build -t calico/felix .
+docker run --privileged --net=host -ti --rm calico/felix