-
Notifications
You must be signed in to change notification settings - Fork 129
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #31 from dougbtv/dockerfile-openshift-go-vendor
Updates Dockerfile.openshift to use the vendor dir
- Loading branch information
Showing
1 changed file
with
5 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 <[email protected]>" | ||
maintainer="CTO Networking <[email protected]>" |