Skip to content

Commit

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

Bug 1872080: Updating Dockerfile.rhel baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Sep 3, 2020
2 parents 1523fda + 70935ce commit 01bbff2
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Dockerfile.rhel
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/cluster-policy-controller
COPY . .
RUN make build --warn-undefined-variables

FROM registry.svc.ci.openshift.org/ocp/4.2:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
COPY --from=builder /go/src/github.com/openshift/cluster-policy-controller/cluster-policy-controller /usr/bin/
LABEL io.k8s.display-name="OpenShift Cluster Policy Controller Command" \
io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
Expand Down

0 comments on commit 01bbff2

Please sign in to comment.