Skip to content

Commit

Permalink
Merge pull request #98 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….18-kube-compare-artifacts

OCPBUGS-41287: Updating kube-compare-artifacts-container image to be consistent with ART for 4.18
  • Loading branch information
openshift-merge-bot[bot] authored Sep 9, 2024
2 parents 155f82c + 727a59f commit 9e9761a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .ci-operator.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.22-openshift-4.18
6 changes: 3 additions & 3 deletions Dockerfile
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 kube-compare
# layered on top of the Linux cli image.
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-builder-multi-openshift-4.17 AS builder-rhel-8
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.18 AS builder-rhel-8
WORKDIR /go/src/github.com/openshift/kube-compare
COPY . .
RUN make cross-build --warn-undefined-variables

FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-builder-multi-openshift-4.17 AS builder-rhel-9
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder-rhel-9
WORKDIR /go/src/github.com/openshift/kube-compare
COPY . .
RUN make cross-build --warn-undefined-variables

FROM --platform=linux/amd64 registry.ci.openshift.org/ocp/4.17:cli as final-builder
FROM registry.ci.openshift.org/ocp/4.18:cli AS final-builder

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

Expand Down

0 comments on commit 9e9761a

Please sign in to comment.