From 779c77eefc572c1556978e3edde947b24390f6af Mon Sep 17 00:00:00 2001 From: dougbtv Date: Wed, 22 Jan 2020 15:28:58 -0500 Subject: [PATCH] Updates Dockerfile.openshift to use the vendor dir --- Dockerfile.openshift | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile.openshift b/Dockerfile.openshift index 09053d9e8..9337a88b1 100644 --- a/Dockerfile.openshift +++ b/Dockerfile.openshift @@ -3,17 +3,17 @@ FROM openshift/origin-release:rhel-8-golang-1.12 as rhel8 ADD . /go/src/github.com/dougbtv/whereabouts WORKDIR /go/src/github.com/dougbtv/whereabouts ENV CGO_ENABLED=1 -ENV GO111MODULE=off +ENV GO111MODULE=on ENV VERSION=rhel8 COMMIT=unset -RUN go build -o bin/whereabouts cmd/whereabouts.go +RUN go build -mod vendor -o bin/whereabouts cmd/whereabouts.go WORKDIR / FROM openshift/origin-release:rhel-7-golang-1.12 as rhel7 ADD . /go/src/github.com/dougbtv/whereabouts WORKDIR /go/src/github.com/dougbtv/whereabouts ENV CGO_ENABLED=1 -ENV GO111MODULE=off -RUN go build -o bin/whereabouts cmd/whereabouts.go +ENV GO111MODULE=on +RUN go build -mod vendor -o bin/whereabouts cmd/whereabouts.go WORKDIR / FROM openshift/origin-base @@ -28,4 +28,4 @@ COPY --from=rhel8 /go/src/github.com/dougbtv/whereabouts/bin/whereabouts /usr/sr LABEL io.k8s.display-name="Whereabouts CNI" \ io.k8s.description="This is a component of OpenShift Container Platform and provides a cluster-wide IPAM CNI plugin." \ io.openshift.tags="openshift" \ - maintainer="CTO Networking " \ No newline at end of file + maintainer="CTO Networking "