Skip to content

Commit

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

Bug 1872080: Updating pod/Dockerfile.rhel baseimages to mach ocp-build-data config
  • Loading branch information
openshift-merge-robot authored Aug 29, 2020
2 parents 0d6d354 + cd0bbf4 commit db12ede
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pod/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.10 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-openshift-4.6 AS builder
WORKDIR /go/src/github.com/openshift/images
COPY . .
RUN CGO_ENABLED=0 go build -installsuffix=cgo -o pod/bin/pod ./pod

FROM registry.svc.ci.openshift.org/ocp/4.0:base
FROM registry.svc.ci.openshift.org/ocp/4.6:base
COPY --from=builder /go/src/github.com/openshift/images/pod/bin/pod /usr/bin/
LABEL io.k8s.display-name="OpenShift Pod" \
io.k8s.description="This is a component of OpenShift and contains the binary that holds the pod namespaces." \
Expand Down

0 comments on commit db12ede

Please sign in to comment.