Skip to content

OCPBUGS-70063: Updating ose-cli-artifacts-container image to be consistent with ART for 4.22 #2168

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
openshift-bot wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −3
Open

OCPBUGS-70063: Updating ose-cli-artifacts-container image to be consistent with ART for 4.22 #2168

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions images/cli-artifacts/Dockerfile.rhel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# This Dockerfile builds an image containing the Mac and Windows version of oc
# layered on top of the Linux cli image.
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.21 AS builder
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.24-openshift-4.22 AS builder
WORKDIR /go/src/github.com/openshift/oc
COPY . .
RUN make cross-build --warn-undefined-variables

FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder-rhel-9
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.22 AS builder-rhel-9
WORKDIR /go/src/github.com/openshift/oc
COPY . .
RUN make cross-build --warn-undefined-variables

FROM registry.ci.openshift.org/ocp/4.21:cli
FROM registry.ci.openshift.org/ocp/4.22:cli

COPY --from=builder-rhel-9 /go/src/github.com/openshift/oc/_output/bin/ /usr/share/openshift/

Expand Down