Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions docker/templates/Dockerfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
<% end -%>
<% if image_flavor == 'full' || image_flavor == 'oss' -%>
<% base_image = 'redhat/ubi9-minimal:latest' -%>
<% go_image = 'golang:1.23' -%>
<% go_image = 'golang:1.25' -%>
<% package_manager = 'microdnf' -%>
<% elsif image_flavor == 'observability-sre' -%>
<% base_image = 'docker.elastic.co/wolfi/chainguard-base-fips' -%>
<% go_image = 'docker.elastic.co/wolfi/go:1.23' -%>
<% go_image = 'docker.elastic.co/wolfi/go:1.25' -%>
<% package_manager = 'apk' -%>
<% else -%>
<% base_image = 'docker.elastic.co/wolfi/chainguard-base' -%>
<% go_image = 'docker.elastic.co/wolfi/go:1.23' -%>
<% go_image = 'docker.elastic.co/wolfi/go:1.25' -%>
<% package_manager = 'apk' -%>
<% end -%>
<% locale = 'C.UTF-8' -%>
Expand Down
4 changes: 2 additions & 2 deletions docker/templates/IronbankDockerfile.erb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ ARG BASE_REGISTRY=registry1.dso.mil
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi9
ARG BASE_TAG=9.6
ARG LOGSTASH_VERSION=<%= elastic_version %>
ARG GOLANG_VERSION=1.21.8
ARG GOLANG_VERSION=1.25.0

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

ENV GOPATH=/go

Expand Down