Skip to content

Commit

Permalink
Merge pull request #130 from openshift-bot/updating-images/dockerfile…
Browse files Browse the repository at this point in the history 
….rhel-baseimages-to-mach-ocp-build-data-config

Bug 1872080: Updating images/Dockerfile.rhel baseimages to mach ocp-build-data config
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored Sep 10, 2020
2 parents 0750948 + 43b2fe9 commit 4376e14
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions images/Dockerfile.rhel
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM registry.svc.ci.openshift.org/ocp/builder:golang-1.14 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
WORKDIR /go/src/github.com/openshift/openshift-apiserver
COPY . .
RUN make build --warn-undefined-variables

FROM registry.svc.ci.openshift.org/ocp/4.5:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
COPY --from=builder /go/src/github.com/openshift/openshift-apiserver/openshift-apiserver /usr/bin/
ENTRYPOINT ["/usr/bin/openshift-apiserver"]
LABEL io.k8s.display-name="OpenShift API Server Command" \
Expand Down

0 comments on commit 4376e14

Please sign in to comment.