Skip to content

Commit 398a66c

Browse files
authored
upgrade golang to 1.25 (#18083)
1 parent 386869a commit 398a66c

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

docker/templates/Dockerfile.erb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
<% end -%>
2121
<% if image_flavor == 'full' || image_flavor == 'oss' -%>
2222
<% base_image = 'redhat/ubi9-minimal:latest' -%>
23-
<% go_image = 'golang:1.23' -%>
23+
<% go_image = 'golang:1.25' -%>
2424
<% package_manager = 'microdnf' -%>
2525
<% elsif image_flavor == 'observability-sre' -%>
2626
<% base_image = 'docker.elastic.co/wolfi/chainguard-base-fips' -%>
27-
<% go_image = 'docker.elastic.co/wolfi/go:1.23' -%>
27+
<% go_image = 'docker.elastic.co/wolfi/go:1.25' -%>
2828
<% package_manager = 'apk' -%>
2929
<% else -%>
3030
<% base_image = 'docker.elastic.co/wolfi/chainguard-base' -%>
31-
<% go_image = 'docker.elastic.co/wolfi/go:1.23' -%>
31+
<% go_image = 'docker.elastic.co/wolfi/go:1.25' -%>
3232
<% package_manager = 'apk' -%>
3333
<% end -%>
3434
<% locale = 'C.UTF-8' -%>

docker/templates/IronbankDockerfile.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ ARG BASE_REGISTRY=registry1.dso.mil
44
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi9
55
ARG BASE_TAG=9.6
66
ARG LOGSTASH_VERSION=<%= elastic_version %>
7-
ARG GOLANG_VERSION=1.21.8
7+
ARG GOLANG_VERSION=1.25.0
88

99
# stage 1: build env2yaml
10-
FROM ${BASE_REGISTRY}/google/golang/ubi9/golang-1.21:${GOLANG_VERSION} AS env2yaml
10+
FROM ${BASE_REGISTRY}/google/golang/ubi9/golang-1.25:${GOLANG_VERSION} AS env2yaml
1111

1212
ENV GOPATH=/go
1313

0 commit comments

Comments
 (0)