Merge pull request #1431 from stanislav-chlebec/master

WIP: fix arm64 docker image building

Author: rastislavs

docker/vpp-cni/Dockerfile.arm64

@@ -1,46 +1,45 @@
 FROM arm64v8/golang:1.10.7-alpine3.8 as builder
 
+# we want a static binary
+ENV CGO_ENABLED=0
+
+RUN apk add --update wget git make gcc linux-headers libc-dev
+
+COPY . /go/src/github.com/contiv/vpp
+
 # we need the loopback binary from CNI
 # this binary can be obtained from the cni tarball
-RUN apk add --update wget \
- && export CNI_VERSION=0.5.1 \
- && wget https://github.com/containernetworking/cni/releases/download/v$CNI_VERSION/cni-arm64-v$CNI_VERSION.tgz \
-    -O /cni.tgz \
+RUN export CNI_VERSION=0.5.1 \
+ && wget https://github.com/containernetworking/cni/releases/download/v$CNI_VERSION/cni-arm64-v$CNI_VERSION.tgz -O /cni.tgz \
  && mkdir /cni \
- && tar -xvf /cni.tgz -C /cni \
- && rm /cni.tgz
-COPY . /go/src/github.com/contiv/vpp
+ && tar -xvf /cni.tgz -C /cni
 
 # Build a custom version of the portmap plugin, modified for VPP-based networking.
-RUN apk add --update git gcc linux-headers libc-dev \
- && export CGO_ENABLED=0 \
- && export CNI_PLUGIN_VERSION=0.7 \
+RUN export CNI_PLUGIN_VERSION=0.7 \
  && mkdir -p /go/src/github.com/containernetworking \
  && cd /go/src/github.com/containernetworking \
  && git clone https://github.com/containernetworking/plugins.git -b v$CNI_PLUGIN_VERSION \
  && cd plugins/plugins/meta/portmap/ \
  && git apply /go/src/github.com/contiv/vpp/docker/vpp-cni/portmap.diff \
  && go build -ldflags '-s -w' -o /portmap
 
-WORKDIR /go/src/github.com/contiv/vpp/cmd/contiv-cni
+WORKDIR /go/src/github.com/contiv/vpp
+
+# build contiv-cni
+RUN make contiv-cni
 
 # we collect & store all files in one folder to make the resulting
 # image smaller when we copy them all in one single operation
-RUN export CGO_ENABLED=0 \
- && mkdir /output/ \
- && cp /cni/loopback /output/ \
- && cp /go/src/github.com/contiv/vpp/docker/vpp-cni/10-contiv-vpp.conflist /output/ \
- && cp /go/src/github.com/contiv/vpp/docker/vpp-cni/install.sh /output/ \
- && cp /portmap /output/ \
- && go build -ldflags '-s -w' -o /output/contiv-cni contiv_cni.go
-
+RUN mkdir -p /output/cni/bin && mkdir -p /output/cni/cfg \
+ && cp cmd/contiv-cni/contiv-cni /output/cni/bin/ \
+ && cp /cni/loopback /output/cni/bin/ \
+ && cp /portmap /output/cni/bin/ \
+ && cp /go/src/github.com/contiv/vpp/docker/vpp-cni/install.sh /output/cni/ \
+ && cp /go/src/github.com/contiv/vpp/docker/vpp-cni/10-contiv-vpp.conflist /output/cni/cfg/
 
 FROM arm64v8/alpine:3.8
 
-# set work directory
-WORKDIR /root/
-
-COPY --from=builder /output/* /root/
+COPY --from=builder /output/cni /cni
 
 # run install script by default
-CMD ["/root/install.sh"]
+CMD ["/cni/install.sh"]

docker/vpp-ksr/Dockerfile.arm64

@@ -15,4 +15,4 @@ FROM scratch
 
 COPY --from=builder /go/src/github.com/contiv/vpp/cmd/contiv-ksr/contiv-ksr /contiv-ksr
 
-ENTRYPOINT ["/contiv-ksr"]
+ENTRYPOINT ["/contiv-ksr"]

docker/vpp-vswitch/prod/vswitch/Dockerfile.arm64

@@ -2,7 +2,7 @@ FROM arm64v8/ubuntu:18.04
 
 RUN apt-get update \
  && apt-get install -y \
-        # vpp-agent & vpp process manger
+        # vpp-agent & vpp process manager
         python supervisor \
         # vpp requirements
         openssl libapr1 libnuma1 libmbedcrypto1 libmbedtls10 libmbedx509-0 \
@@ -12,6 +12,8 @@ RUN apt-get update \
         iproute2 iputils-ping inetutils-traceroute \
         # ability to run vpptrace.sh
         netcat-openbsd \
+        # ability to visualize graph of configured objects
+        graphviz \
  && rm -rf /var/lib/apt/lists/*
 
 # use /opt/vpp-agent/dev as the working directory