Merge pull request #18 from stlaz/golang-1.14

Bug bug 1875038: bump golang to 1.14
openshift · Sep 4, 2020 · f0d09c6 · f0d09c6
2 parents 4ccacb0 + c2d2e6f
commit f0d09c6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/images/Dockerfile.rhel7 b/images/Dockerfile.rhel7
@@ -1,9 +1,9 @@
-FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.13 AS builder
+FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder
 WORKDIR /go/src/github.com/openshift/oauth-apiserver
 COPY . .
 RUN make build --warn-undefined-variables
 
-FROM registry.svc.ci.openshift.org/ocp/4.4:base
+FROM registry.svc.ci.openshift.org/ocp/4.6:base
 COPY --from=builder /go/src/github.com/openshift/oauth-apiserver/oauth-apiserver /usr/bin/
 ENTRYPOINT ["/usr/bin/oauth-apiserver"]
 LABEL io.k8s.display-name="OpenShift OAuth API Server Command" \