Skip to content

Commit deee68d

Browse files
jsvdmergify[bot]
authored andcommitted
upgrade golang to 1.25 (#18083)
(cherry picked from commit 398a66c) # Conflicts: # docker/templates/Dockerfile.erb
1 parent b848ad7 commit deee68d

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

docker/templates/Dockerfile.erb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,18 @@
1717
<% end -%>
1818
<% if image_flavor == 'full' || image_flavor == 'oss' -%>
1919
<% base_image = 'redhat/ubi9-minimal:latest' -%>
20-
<% go_image = 'golang:1.23' -%>
20+
<% go_image = 'golang:1.25' -%>
2121
<% package_manager = 'microdnf' -%>
22+
<<<<<<< HEAD
23+
=======
24+
<% elsif image_flavor == 'observability-sre' -%>
25+
<% base_image = 'docker.elastic.co/wolfi/chainguard-base-fips' -%>
26+
<% go_image = 'docker.elastic.co/wolfi/go:1.25' -%>
27+
<% package_manager = 'apk' -%>
28+
>>>>>>> 398a66cb (upgrade golang to 1.25 (#18083))
2229
<% else -%>
2330
<% base_image = 'docker.elastic.co/wolfi/chainguard-base' -%>
24-
<% go_image = 'docker.elastic.co/wolfi/go:1.23' -%>
31+
<% go_image = 'docker.elastic.co/wolfi/go:1.25' -%>
2532
<% package_manager = 'apk' -%>
2633
<% end -%>
2734
<% 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)