Skip to content

Commit

Permalink
Merge pull request #61 from openshift-bot/art-consistency-openshift-4…
Browse files Browse the repository at this point in the history
….16-ose-ibm-cloud-controller-manager

OCPBUGS-24921: Updating ose-ibm-cloud-controller-manager-container image to be consistent with ART
  • Loading branch information
openshift-merge-bot[bot] committed Dec 13, 2023
2 parents 4f4a139 + 0210668 commit d31fce7
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
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.20-openshift-4.15
tag: rhel-9-release-golang-1.20-openshift-4.16
4 changes: 2 additions & 2 deletions openshift-hack/images/Dockerfile.openshift
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.20-openshift-4.15 AS ccm-builder
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.20-openshift-4.16 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.15:base-rhel9
FROM registry.ci.openshift.org/ocp/4.16: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 d31fce7

Please sign in to comment.