Skip to content
Permalink
Browse files

[dockerfile] Use ENV GO111MODULE=off when building from openshift/ori…

…gin-release:golang-1.10
  • Loading branch information...
dougbtv authored and s1061123 committed Aug 31, 2019
1 parent e2f75d4 commit 83556f49bd6706a885eda847210b542669279cd0
Showing with 3 additions and 2 deletions.
  1. +1 −0 .travis.yml
  2. +2 −2 Dockerfile.openshift
@@ -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:
@@ -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 <dosmith@redhat.com>"

ENTRYPOINT ["/entrypoint.sh"]
ENTRYPOINT ["/entrypoint.sh"]

0 comments on commit 83556f4

Please sign in to comment.
You can’t perform that action at this time.