Skip to content
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

Use golang builder image and bundle dockerfile in line with OCP 4.19 #2663

Merged
merged 2 commits into from
Feb 1, 2025
+7 −7
Merged

Use golang builder image and bundle dockerfile in line with OCP 4.19 #2663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
538912c
[build] Use golang builder image in line with OCP 4.19
jrvaldes Jan 29, 2025
881aae8
[bundle] adjust dockerfile for OCP 4.19
jrvaldes Jan 29, 2025
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
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
build_root_image:
namespace: openshift
name: release
tag: rhel-9-release-golang-1.22-openshift-4.18
tag: rhel-9-release-golang-1.22-openshift-4.19
2 changes: 1 addition & 1 deletion build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 as build
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.19 as build

LABEL stage=build

Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.base
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 as build
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.19 as build
LABEL stage=build

# Silence go compliance shim output
Expand Down
4 changes: 2 additions & 2 deletions build/Dockerfile.ci
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# building the operator from the PR source without using the operator-sdk.

# build stage for building binaries
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 as build
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.19 as build
LABEL stage=build
WORKDIR /build/

Expand Down Expand Up @@ -136,7 +136,7 @@ RUN make build-daemon
#│ └── windows-exporter-webconfig.yaml
#└── windows-instance-config-daemon.exe

FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.18
FROM registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.22-openshift-4.19
LABEL stage=operator

WORKDIR /payload/
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.wmco
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 as build
FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.19 as build
LABEL stage=build

# Silence go compliance shim output
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ LABEL com.redhat.delivery.operator.bundle=true

# This second label tells the pipeline which versions of OpenShift the operator supports.
# This is used to control which index images should include this operator.
LABEL com.redhat.openshift.versions="=v4.18"
LABEL com.redhat.openshift.versions="=v4.19"

# This third label tells the pipeline that this operator should *also* be supported on OCP 4.4 and
# earlier. It is used to control whether or not the pipeline should attempt to automatically
Expand Down