Merge branch 'main' into github

vegardb · vegardb · commit 62f291b08169 · 2026-06-05T08:22:26.000+02:00
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -37,7 +37,7 @@ RUN apt-get update && apt-get install -y \
 COPY rawdataforecaster/build/package/golang_checksums.txt /tmp/golang_checksums.txt
 
 # NOTE: When updating this, make sure to also set golang version in go.mod to the same version
-ARG GOLANG_VERSION=1.26.1
+ARG GOLANG_VERSION=1.26.4
 ARG TARGETARCH
 
 RUN \
diff --git a/correctedforecaster/build/package/Dockerfile b/correctedforecaster/build/package/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 
-ARG GOLANG_VERSION=1.26.1
+ARG GOLANG_VERSION=1.26.4
 ARG TARGETARCH
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/fortiup/build/package/Dockerfile b/fortiup/build/package/Dockerfile
@@ -1,5 +1,5 @@
 FROM ubuntu:24.04
-ARG GOLANG_VERSION=1.26.1
+ARG GOLANG_VERSION=1.26.4
 ARG TARGETARCH
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/metno/forti
 
-go 1.26.3
+go 1.26.4
 
 require (
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
diff --git a/healthz/build/package/Dockerfile b/healthz/build/package/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.26
+FROM golang:1.26.4
 
 COPY go.mod /src/go.mod
 COPY go.sum /src/go.sum
diff --git a/jsonfrontend/build/package/Dockerfile b/jsonfrontend/build/package/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.26
+FROM golang:1.26.4
 
 COPY go.mod /src/go.mod
 COPY go.sum /src/go.sum
diff --git a/moxfrontend/build/package/Dockerfile b/moxfrontend/build/package/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.26
+FROM golang:1.26.4
 
 COPY go.mod /src/go.mod
 COPY go.sum /src/go.sum
diff --git a/rawdataforecaster/build/package/Dockerfile b/rawdataforecaster/build/package/Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:24.04
 
-ARG GOLANG_VERSION=1.26.1
+ARG GOLANG_VERSION=1.26.4
 ARG TARGETARCH
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
diff --git a/rawdataforecaster/build/package/golang_checksums.txt b/rawdataforecaster/build/package/golang_checksums.txt
@@ -1,2 +1,2 @@
-031f088e5d955bab8657ede27ad4e3bc5b7c1ba281f05f245bcc304f327c987a  go1.26.1.linux-amd64.tar.gz
-a290581cfe4fe28ddd737dde3095f3dbeb7f2e4065cab4eae44dfc53b760c2f7  go1.26.1.linux-arm64.tar.gz
+1153d3d50e0ac764b447adfe05c2bcf08e889d42a02e0fe0259bd47f6733ad7f  go1.26.4.linux-amd64.tar.gz
+ef758ae7c6cf9267c9c0ef080b8965f453d89ab2d25d9eb22de4405925238768  go1.26.4.linux-arm64.tar.gz
diff --git a/xmlfrontend/build/package/Dockerfile b/xmlfrontend/build/package/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.26
+FROM golang:1.26.4
 
 COPY go.mod /src/go.mod
 COPY go.sum /src/go.sum

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM golang:1.26`
	`1`	`+FROM golang:1.26.4`
`2`	`2`
`3`	`3`	`COPY go.mod /src/go.mod`
`4`	`4`	`COPY go.sum /src/go.sum`