Skip to content

Commit

Permalink
Merge pull request #363 from mjlshen/OSD-24219
Browse files Browse the repository at this point in the history
Create boilerplate v5.0.1 to support Go 1.22
  • Loading branch information
openshift-merge-bot[bot] authored Jul 8, 2024
2 parents 950052c + b4498b3 commit 15ab0d3
Show file tree
Hide file tree
Showing 13 changed files with 130 additions and 549 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:
namespace: openshift
name: release
tag: rhel-8-release-golang-1.21-openshift-4.16
tag: rhel-8-release-golang-1.22-openshift-4.17
6 changes: 3 additions & 3 deletions config/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is used to confirm that the imagestream is valid and working
# the below statement will always be replaced by the source in .ci-operator.yaml
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.21-openshift-4.16
FROM registry.ci.openshift.org/openshift/release:rhel-8-release-golang-1.22-openshift-4.17

# TODO: remove this COPY/RUN
COPY build_image-v5.0.0.sh /build.sh
RUN /build.sh && rm /build.sh
COPY build_image.sh /build_image.sh
RUN /build_image.sh && rm /build_image.sh
6 changes: 3 additions & 3 deletions config/Dockerfile.appsre
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# To check for existence of an image: https://docs.ci.openshift.org/docs/how-tos/use-registries-in-build-farm/
# Log into build farm's registry and validate the image exists
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16
FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17

COPY build_image-v5.0.0.sh /build.sh
RUN /build.sh && rm -f /build.sh
COPY build_image.sh /build_image.sh
RUN /build_image.sh && rm -f /build_image.sh
154 changes: 0 additions & 154 deletions config/build_image-v1.0.0.sh

This file was deleted.

121 changes: 0 additions & 121 deletions config/build_image-v2.0.0.sh

This file was deleted.

Loading

0 comments on commit 15ab0d3

Please sign in to comment.