From de5f71e37f6c24c813f06f8cdd87431a6a490bed Mon Sep 17 00:00:00 2001 From: Callum Morris Date: Thu, 30 Jan 2025 16:12:46 +1300 Subject: [PATCH 1/2] fix: upgrade fits to go 1.23 --- Dockerfile_template | 2 +- build.sh | 2 +- go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile_template b/Dockerfile_template index 5b590f01..5f30477e 100644 --- a/Dockerfile_template +++ b/Dockerfile_template @@ -1,4 +1,4 @@ -ARG BUILDER_IMAGE=ghcr.io/geonet/base-images/go:1.21 +ARG BUILDER_IMAGE=ghcr.io/geonet/base-images/golang:1.23.5-alpine3.21 ARG RUNNER_IMAGE=ghcr.io/geonet/base-images/static:latest ARG RUN_USER=nobody # Only support image based on AlpineLinux diff --git a/build.sh b/build.sh index 3a8d8d52..af7f235b 100755 --- a/build.sh +++ b/build.sh @@ -17,7 +17,7 @@ if [ $# -eq 0 ]; then fi # code will be compiled in this container -BUILDER_IMAGE='ghcr.io/geonet/base-images/go:1.21' +BUILDER_IMAGE='ghcr.io/geonet/base-images/golang:1.23.5-alpine3.21' RUNNER_IMAGE='ghcr.io/geonet/base-images/static:latest' VERSION='git-'$(git rev-parse --short HEAD) diff --git a/go.mod b/go.mod index 39c7ed1c..66111165 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/GeoNet/fits -go 1.21 +go 1.23 require ( github.com/GeoNet/kit v0.0.0-20241129025613-745247c4fb1c From 79305d49ab94344c2b57853e28045b4b875f2409 Mon Sep 17 00:00:00 2001 From: Callum Morris Date: Thu, 30 Jan 2025 16:17:32 +1300 Subject: [PATCH 2/2] fix: upgrade dapper to go 1.23 --- dapper/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dapper/go.mod b/dapper/go.mod index c7845e81..cbd9fd44 100644 --- a/dapper/go.mod +++ b/dapper/go.mod @@ -1,6 +1,6 @@ module github.com/GeoNet/fits/dapper -go 1.21.0 +go 1.23 require ( github.com/GeoNet/kit v0.0.0-20241129025613-745247c4fb1c