Skip to content

Commit 955b1a2

Browse files
authored
Merge pull request #914 from ecordell/go-1.11
Switch to go 1.12 in the root Dockerfile
2 parents ae0c9f0 + dbe7f67 commit 955b1a2

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Dockerfile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
FROM openshift/origin-release:golang-1.10 as builder
1+
FROM openshift/origin-release:golang-1.12 as builder
22
RUN yum update -y
33
RUN yum install -y make git
44

5+
ENV GO111MODULE auto
56
ENV GOPATH /go
67
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
78

8-
WORKDIR /go/src/github.com/operator-framework/operator-lifecycle-manager
9+
WORKDIR /build
910

1011
# copy just enough of the git repo to parse HEAD, used to record version in OLM binaries
1112
COPY .git/HEAD .git/HEAD
@@ -18,9 +19,8 @@ COPY pkg pkg
1819
COPY vendor vendor
1920
COPY cmd cmd
2021
COPY test test
21-
COPY scripts scripts
22-
COPY deploy deploy
23-
RUN make verify-manifests
22+
COPY go.mod go.mod
23+
COPY go.sum go.sum
2424
RUN make build
2525

2626
FROM openshift/origin-base
@@ -29,9 +29,9 @@ ADD manifests/ /manifests
2929
LABEL io.openshift.release.operator=true
3030

3131
# Copy the binary to a standard location where it will run.
32-
COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/olm /bin/olm
33-
COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/catalog /bin/catalog
34-
COPY --from=builder /go/src/github.com/operator-framework/operator-lifecycle-manager/bin/package-server /bin/package-server
32+
COPY --from=builder /build/bin/olm /bin/olm
33+
COPY --from=builder /build/bin/catalog /bin/catalog
34+
COPY --from=builder /build/bin/package-server /bin/package-server
3535

3636
# This image doesn't need to run as root user.
3737
USER 1001

0 commit comments

Comments
 (0)