Skip to content

Commit

Permalink
Merge pull request #47 from jupierce/art-consistency-openshift-4.7-op…
Browse files Browse the repository at this point in the history
…enshift-enterprise-pod

Updating openshift-enterprise-pod builder & base images to be consistent with ART
  • Loading branch information
openshift-bot committed Oct 31, 2020
2 parents ec6a8a8 + 9bc44fe commit 5affdce
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pod/Dockerfile.rhel
@@ -1,9 +1,9 @@
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.6 AS builder
FROM registry.svc.ci.openshift.org/ocp/builder:rhel-8-golang-1.15-openshift-4.7 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.6:base
FROM registry.svc.ci.openshift.org/ocp/4.7: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 5affdce

Please sign in to comment.