Skip to content

Commit

Permalink
UPSTREAM: <carry>: Updating ose-ibm-cloud-controller-manager-containe…
Browse files Browse the repository at this point in the history 
…r image to be consistent with ART for 4.18

Reconciling with https://github.com/openshift/ocp-build-data/tree/827ab4ccce9cbbcf82c9dbaf6398b61d6cff8d7a/images/ose-ibm-cloud-controller-manager.yml
  • Loading branch information
AOS Automation Release Team authored and cloud-team-rebase-bot committed Oct 10, 2024
1 parent 056c6a4 commit 245b96f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: release
namespace: openshift
tag: rhel-9-release-golang-1.22-openshift-4.17
tag: rhel-9-release-golang-1.22-openshift-4.18
4 changes: 2 additions & 2 deletions openshift-hack/images/Dockerfile.openshift
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Build IBM cloud controller manager binary
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS ccm-builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS ccm-builder
WORKDIR /build
COPY . .
RUN CGO_ENABLED=0 go build -ldflags "-s -w" -o ibm-cloud-controller-manager .

# Assemble the final image
FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
LABEL description="IBM Cloud Controller Manager"
COPY --from=ccm-builder /build/ibm-cloud-controller-manager /bin/ibm-cloud-controller-manager
ENTRYPOINT [ "/bin/ibm-cloud-controller-manager" ]

0 comments on commit 245b96f

Please sign in to comment.