Skip to content

Commit d2311d8

Browse files
committed
BUILD-1165: Updating s2i to golang 1.22
Updating the Dockerfile and go.mod to require golang 1.22. Changing the go runtime also requires a bump to the s2i minor version. Dockerfile has also been updated to use the "patch" version of the UBI base images. This ensures we have reproducible builds, since the "patch" tags from Red Hat are effectively immutable. Konflux should also provide updates to the patch version through Renovate. Signed-off-by: Adam Kaplan <[email protected]>
1 parent 6b4cd94 commit d2311d8

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Dockerfile

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM registry.redhat.io/ubi8/go-toolset:1.21 AS builder
1+
FROM registry.redhat.io/ubi8/go-toolset:1.22.7-5 AS builder
22

3-
ENV S2I_GIT_VERSION="1.4.1" \
3+
ENV S2I_GIT_VERSION="1.5.0" \
44
S2I_GIT_MAJOR="1" \
5-
S2I_GIT_MINOR="4"
5+
S2I_GIT_MINOR="5"
66

77
COPY . .
88

@@ -12,7 +12,7 @@ RUN CGO_ENABLED=0 GO111MODULE=on go build -a -mod=vendor -ldflags="-s -w" -o /tm
1212
# Runner Image
1313
#
1414

15-
FROM registry.redhat.io/ubi8/ubi-minimal:8.10
15+
FROM registry.redhat.io/ubi8/ubi-minimal:8.10-1130
1616

1717
COPY --from=builder /tmp/s2i /usr/local/bin/s2i
1818

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/openshift/source-to-image
22

3-
go 1.21.0
3+
go 1.22
44

55
require (
66
github.com/containers/image/v5 v5.31.1

0 commit comments

Comments
 (0)