Skip to content

Commit 3304cb7

Browse files
spotlesstofugkurz
authored andcommitted
Update image refs to go 1.22
Signed-off-by: Camilla Conte <[email protected]> (cherry picked from commit f944f6b) Signed-off-by: Greg Kurz <[email protected]>
1 parent 53b8c6f commit 3304cb7

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Use OpenShift golang builder image
22
# These images needs to be synced with the images in the Makefile.
3-
ARG BUILDER_IMAGE=${BUILDER_IMAGE:-registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16}
4-
ARG TARGET_IMAGE=${TARGET_IMAGE:-registry.ci.openshift.org/ocp/4.16:base}
3+
ARG BUILDER_IMAGE=${BUILDER_IMAGE:-registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17}
4+
ARG TARGET_IMAGE=${TARGET_IMAGE:-registry.ci.openshift.org/ocp/4.17:base}
55
FROM ${BUILDER_IMAGE} AS builder
66

77
WORKDIR /workspace

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ GOBIN=$(shell go env GOBIN)
6464
endif
6565

6666
# These images needs to be synced with the default values in the Dockerfile.
67-
BUILDER_IMAGE ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16
68-
TARGET_IMAGE ?= registry.ci.openshift.org/ocp/4.16:base
67+
BUILDER_IMAGE ?= registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
68+
TARGET_IMAGE ?= registry.ci.openshift.org/ocp/4.17:base
6969
# CONTAINER_TOOL defines the container tool to be used for building images.
7070
# Be aware that the target commands are only tested with Docker which is
7171
# scaffolded by default. However, you might want to replace it to use other

docs/DEVELOPMENT.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Hacking on the sandboxed-containers-operator
22

33
## Prerequisites
4-
- Golang - 1.21.x
4+
- Golang - 1.22.x
55
- Operator SDK version - 1.36.1
66
```
77
export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)
@@ -32,8 +32,8 @@ public images during build and test. At the time of writing, the following publi
3232
does the trick.
3333

3434
```shell
35-
export BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:golang-1.21
36-
export TARGET_IMAGE=registry.ci.openshift.org/origin/4.16:base
35+
export BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:golang-1.22
36+
export TARGET_IMAGE=registry.ci.openshift.org/origin/4.17:base
3737
make docker-build
3838
```
3939

0 commit comments

Comments
 (0)