diff --git a/.travis.yml b/.travis.yml index efbe34fe0..cda5f263e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,7 @@ script: 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-ppc64le -f Dockerfile.ppc64le . + docker build -t nfvpe/multus-origin:latest -f Dockerfile.openshift . fi deploy: diff --git a/Dockerfile.openshift b/Dockerfile.openshift index de88066f1..cf6ebd08a 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -4,11 +4,11 @@ FROM openshift/origin-release:golang-1.10 as builder ADD . /usr/src/multus-cni WORKDIR /usr/src/multus-cni +ENV GO111MODULE=off RUN ./build FROM openshift/origin-base RUN mkdir -p /usr/src/multus-cni/images && mkdir -p /usr/src/multus-cni/bin -COPY --from=builder /usr/src/multus-cni/images/70-multus.conf /usr/src/multus-cni/images COPY --from=builder /usr/src/multus-cni/bin/multus /usr/src/multus-cni/bin ADD ./images/entrypoint.sh / @@ -17,4 +17,4 @@ LABEL io.k8s.display-name="Multus CNI" \ io.openshift.tags="openshift" \ maintainer="Doug Smith " -ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/entrypoint.sh"]