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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Build the mattermost operator
# NOTE: For production builds, pin these images to digests for supply-chain safety.
# Example: golang:1.25.9@sha256:<digest>
# Example: golang:1.26.3@sha256:<digest>
# See Dockerfile.fips for an example of digest-pinned images.
ARG BUILD_IMAGE=golang:1.25.9
ARG BUILD_IMAGE=golang:1.26.3
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot

FROM ${BUILD_IMAGE} as builder
Expand Down
6 changes: 2 additions & 4 deletions Dockerfile.fips
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# Build the mattermost operator (FIPS version)
ARG BUILD_IMAGE=cgr.dev/mattermost.com/go-msft-fips:1.25.9@sha256:ca33f3634a8f23ca6b3eaad280617effce698b23da56499731c75cfc9057bb45
# TODO: Pin BASE_IMAGE to digest for supply-chain safety (registry requires auth to resolve).
# Matching BUILD_IMAGE above when digest becomes available.
ARG BASE_IMAGE=cgr.dev/mattermost.com/glibc-openssl-fips:15.2@sha256:ffcaa014791edcc8635785336fe42eb5cdebacfa88221a2af319fcdf3e82ab6d
ARG BUILD_IMAGE=cgr.dev/mattermost.com/go-msft-fips:1.26.3@sha256:90017f556002f392c7eb21a96bf845e1b0675cb32a43ac8c85c25cbb80e848cc
ARG BASE_IMAGE=cgr.dev/mattermost.com/glibc-openssl-fips:16.1.0@sha256:3ffd0b8b652a95f17764ff4cd3abf5a424651ebae407fb98085e01ff40e5de7c

FROM ${BUILD_IMAGE} as builder

Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ BUILD_IMAGE = golang:$(GOLANG_VERSION)
BASE_IMAGE = gcr.io/distroless/static:nonroot

## FIPS Docker Build Versions
BUILD_IMAGE_FIPS = cgr.dev/mattermost.com/go-msft-fips:1.25
BASE_IMAGE_FIPS = cgr.dev/mattermost.com/glibc-openssl-fips:15.1
BUILD_IMAGE_FIPS = cgr.dev/mattermost.com/go-msft-fips:1.26.3@sha256:90017f556002f392c7eb21a96bf845e1b0675cb32a43ac8c85c25cbb80e848cc
BASE_IMAGE_FIPS = cgr.dev/mattermost.com/glibc-openssl-fips:16.1.0@sha256:3ffd0b8b652a95f17764ff4cd3abf5a424651ebae407fb98085e01ff40e5de7c

################################################################################

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/mattermost/mattermost-operator

go 1.25.9
go 1.26.3

require (
github.com/banzaicloud/k8s-objectmatcher v1.8.0
Expand Down
2 changes: 1 addition & 1 deletion test/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ run_ct_container() {
docker run --rm --interactive --detach --network host --name test-cont \
--volume "$(pwd):/go/src/github.com/mattermost/mattermost-operator" \
--workdir "/go/src/github.com/mattermost/mattermost-operator" \
"golang:1.25" \
"golang:1.26" \
cat
echo
}
Expand Down
Loading