Skip to content

Commit

Permalink
Merge pull request #31 from dougbtv/dockerfile-openshift-go-vendor
Browse files Browse the repository at this point in the history
Updates Dockerfile.openshift to use the vendor dir
  • Loading branch information
dougbtv authored Jan 22, 2020
2 parents 1c58c10 + 779c77e commit 7263a7f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Dockerfile.openshift
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 <[email protected]>"
maintainer="CTO Networking <[email protected]>"

0 comments on commit 7263a7f

Please sign in to comment.