Skip to content

Commit

Permalink
Merge pull request #680 from openshift-bot/art-consistency-openshift-…
Browse files Browse the repository at this point in the history
…4.8-openshift-enterprise-pod

Updating openshift-enterprise-pod images to be consistent with ART
  • Loading branch information
openshift-merge-robot committed Nov 18, 2021
2 parents 6a39d04 + b039e70 commit fb294cb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions build/pause/Dockerfile.Rhel
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM registry.ci.openshift.org/ocp/builder:ubi8.art AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.16-openshift-4.8 AS builder
WORKDIR /go/src/github.com/openshift/kubernetes/build/pause
COPY . .
RUN dnf install -y gcc glibc-static && \
mkdir -p bin && \
gcc -Os -Wall -Werror -static -o bin/pause ./linux/pause.c

FROM scratch
FROM registry.ci.openshift.org/ocp/4.8:base
COPY --from=builder /go/src/github.com/openshift/kubernetes/build/pause/bin/pause /usr/bin/pod
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 fb294cb

Please sign in to comment.