Merge e7b1875 into a1b852b

k8snetworkplumbingwg · Jul 29, 2019 · a413cf3 · a413cf3
2 parents a1b852b + e7b1875
commit a413cf3
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 16 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,6 +13,9 @@ env:
     - REGISTRY_USER=${REGISTRY_USER}
     - REGISTRY_PASS=${REGISTRY_PASS}
     - secure: "${REGISTRY_SECURE}"
+  matrix:
+    - TARGET=amd64
+    - TARGET=ppc64le
 
 before_install:
   - sudo apt-get update -qq
@@ -30,12 +33,16 @@ before_script:
 #  - gocyclo -over 15 ./multus
 
 script:
-  - ./build
-  - sudo env PATH=${PATH} ./test.sh
-  - goveralls -coverprofile=coverage.out -service=travis-ci
-  - mkdir -p ${TRAVIS_BUILD_DIR}/dist
-  - tar cvfz ${TRAVIS_BUILD_DIR}/dist/multus-cni_amd64.tar.gz --warning=no-file-changed --exclude="dist" .
-  - docker build -t nfvpe/multus .
+  - GOARCH="${TARGET} ./build
+  - |
+    if [ "${TARGET}" == "amd64" ]; then
+      sudo env PATH=${PATH} ./test.sh
+      goveralls -coverprofile=coverage.out -service=travis-ci
+      mkdir -p ${TRAVIS_BUILD_DIR}/dist
+      tar cvfz ${TRAVIS_BUILD_DIR}/dist/multus-cni_amd64.tar.gz --warning=no-file-changed --exclude="dist" .
+      docker build -t nfvpe/multus:latest-amd64 .
+      docker build -t nfvpe/multus:latest-ppcle64 -f Dockerfile.ppcle64 .
+    fi
 
 deploy:
   # Release on versioned tag (e.g. v1.0)
@@ -51,11 +58,18 @@ deploy:
     skip_cleanup: true
     script: >
       bash -c '
-      docker tag nfvpe/multus nfvpe/multus:$TRAVIS_TAG;
-      docker tag nfvpe/multus nfvpe/multus:stable;
+      docker tag nfvpe/multus:latest-amd64 nfvpe/multus:latest;
+      docker tag nfvpe/multus:latest-amd64 nfvpe/multus:stable;
+      docker tag nfvpe/multus:latest-amd64 nfvpe/multus:stable-amd64;
+      docker tag nfvpe/multus:latest-amd64 nfvpe/multus:$TRAVIS_TAG;
+      docker tag nfvpe/multus:latest-ppcle64 nfvpe/multus:stable-ppcle64;
       docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASS"; 
-      docker push nfvpe/multus;
+      docker push nfvpe/multus:latest;
+      docker push nfvpe/multus:latest-amd64;
+      docker push nfvpe/multus:latest-ppcle64;
       docker push nfvpe/multus:stable;
+      docker push nfvpe/multus:stable-amd64;
+      docker push nfvpe/multus:stable-ppcle64;
       docker push nfvpe/multus:$TRAVIS_TAG;
       echo done'
     on:
@@ -68,10 +82,16 @@ deploy:
       branch: master
     script: >
       bash -c '
-      docker tag nfvpe/multus nfvpe/multus:snapshot;
+      docker tag nfvpe/multus:latest-amd64 nfvpe/multus:snapshot;
+      docker tag nfvpe/multus:latest-amd64 nfvpe/multus:snapshot-amd64;
+      docker tag nfvpe/multus:latest-ppcle64 nfvpe/multus:snapshot-ppcle64;
       docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASS";
       docker push nfvpe/multus:snapshot;
+      docker push nfvpe/multus:snapshot-amd64;
+      docker push nfvpe/multus:snapshot-ppcle64;
       docker push nfvpe/multus:latest;
+      docker push nfvpe/multus:latest-amd64;
+      docker push nfvpe/multus:latest-ppcle64;
       echo done'
 
 after_success:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # This Dockerfile is used to build the image available on DockerHub
-FROM centos:centos7
+FROM centos:centos7 as build
 
 # Add everything
 ADD . /usr/src/multus-cni
@@ -10,13 +10,11 @@ RUN rpm --import https://mirror.go-repo.io/centos/RPM-GPG-KEY-GO-REPO && \
     yum install -y $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     cd /usr/src/multus-cni && \
-    ./build && \
-    yum autoremove -y $INSTALL_PKGS && \
-    yum clean all && \
-    rm -rf /tmp/*
+    ./build
 
+FROM centos:centos7
+COPY --from=build /usr/src/multus-cni /usr/src/multus-cni
 WORKDIR /
 
 ADD ./images/entrypoint.sh /
-
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/Dockerfile.ppc64le b/Dockerfile.ppc64le
@@ -0,0 +1,25 @@
+# This Dockerfile is used to build the image available on DockerHub
+FROM centos:centos7 as build
+
+# Add everything
+ADD . /usr/src/multus-cni
+
+ENV GOARCH "ppc64le"
+ENV GOOS "linux"
+
+ENV INSTALL_PKGS "git golang"
+RUN rpm --import https://mirror.go-repo.io/centos/RPM-GPG-KEY-GO-REPO && \
+    curl -s https://mirror.go-repo.io/centos/go-repo.repo | tee /etc/yum.repos.d/go-repo.repo && \
+    yum install -y $INSTALL_PKGS && \
+    rpm -V $INSTALL_PKGS && \
+    cd /usr/src/multus-cni && \
+    ./build
+
+# build ppc container
+FROM ppc64le/centos:latest
+COPY --from=build /usr/src/multus-cni /usr/src/multus-cni
+
+WORKDIR /
+ADD ./images/entrypoint.sh /
+
+ENTRYPOINT ["/entrypoint.sh"]