diff --git a/build/testStartupScriptGenerators.sh b/build/testStartupScriptGenerators.sh index 4e59a80f34..100fa5afb0 100644 --- a/build/testStartupScriptGenerators.sh +++ b/build/testStartupScriptGenerators.sh @@ -25,7 +25,7 @@ declare -r MODULE_TO_TEST="..." declare -r CONTAINER_NAME="oryxtests_$RANDOM" echo "Running tests in golang docker image..." -docker run -v $GEN_DIR:$GEN_DIR_CONTAINER_RO:ro --name $CONTAINER_NAME mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye bash -c \ +docker run -v $GEN_DIR:$GEN_DIR_CONTAINER_RO:ro --name $CONTAINER_NAME mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bullseye bash -c \ "cp -rf $GEN_DIR_CONTAINER_RO/* $GEN_DIR_CONTAINER && \ cd $GEN_DIR_CONTAINER && \ chmod u+x restorePackages.sh && \ diff --git a/images/runtime/dotnetcore/10.0/noble.Dockerfile b/images/runtime/dotnetcore/10.0/noble.Dockerfile index b1a0b9ed8d..9f769ce43d 100644 --- a/images/runtime/dotnetcore/10.0/noble.Dockerfile +++ b/images/runtime/dotnetcore/10.0/noble.Dockerfile @@ -22,7 +22,7 @@ RUN --mount=type=secret,id=vss_nuget_accesstoken,target=/run/secrets/vss_nuget_a dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 10.0.0-rc.1.25460.1 # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm AS startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bookworm AS startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/dotnetcore/8.0/bookworm.Dockerfile b/images/runtime/dotnetcore/8.0/bookworm.Dockerfile index 6cdfbe06fb..f41a3f5e96 100644 --- a/images/runtime/dotnetcore/8.0/bookworm.Dockerfile +++ b/images/runtime/dotnetcore/8.0/bookworm.Dockerfile @@ -22,7 +22,7 @@ RUN --mount=type=secret,id=vss_nuget_accesstoken,target=/run/secrets/vss_nuget_a dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 8.* # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm AS startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bookworm AS startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/dotnetcore/8.0/bullseye.Dockerfile b/images/runtime/dotnetcore/8.0/bullseye.Dockerfile index 91781073b3..4676c8b9d2 100644 --- a/images/runtime/dotnetcore/8.0/bullseye.Dockerfile +++ b/images/runtime/dotnetcore/8.0/bullseye.Dockerfile @@ -22,7 +22,7 @@ RUN --mount=type=secret,id=vss_nuget_accesstoken,target=/run/secrets/vss_nuget_a dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 8.* # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye AS startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bullseye AS startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/dotnetcore/9.0/bookworm.Dockerfile b/images/runtime/dotnetcore/9.0/bookworm.Dockerfile index b9ea208cf3..ce20425618 100644 --- a/images/runtime/dotnetcore/9.0/bookworm.Dockerfile +++ b/images/runtime/dotnetcore/9.0/bookworm.Dockerfile @@ -22,7 +22,7 @@ RUN --mount=type=secret,id=vss_nuget_accesstoken,target=/run/secrets/vss_nuget_a dotnet tool install --tool-path /dotnetcore-tools dotnet-monitor --version 9.* # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm AS startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bookworm AS startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/node/18/bullseye.Dockerfile b/images/runtime/node/18/bullseye.Dockerfile index 5cb9df9724..5534892a94 100644 --- a/images/runtime/node/18/bullseye.Dockerfile +++ b/images/runtime/node/18/bullseye.Dockerfile @@ -1,7 +1,7 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bullseye as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/node/20/bookworm.Dockerfile b/images/runtime/node/20/bookworm.Dockerfile index ca1f6ab8c0..1794f0427b 100644 --- a/images/runtime/node/20/bookworm.Dockerfile +++ b/images/runtime/node/20/bookworm.Dockerfile @@ -1,7 +1,7 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bookworm as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/node/20/bullseye.Dockerfile b/images/runtime/node/20/bullseye.Dockerfile index c0809c9ae5..aac5950680 100644 --- a/images/runtime/node/20/bullseye.Dockerfile +++ b/images/runtime/node/20/bullseye.Dockerfile @@ -1,7 +1,7 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bullseye as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/node/22/bookworm.Dockerfile b/images/runtime/node/22/bookworm.Dockerfile index 7fcf08c744..3e2e0d0e4e 100644 --- a/images/runtime/node/22/bookworm.Dockerfile +++ b/images/runtime/node/22/bookworm.Dockerfile @@ -1,7 +1,7 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bookworm as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/node/22/bullseye.Dockerfile b/images/runtime/node/22/bullseye.Dockerfile index 7a631ae0a8..94f6d3dc69 100644 --- a/images/runtime/node/22/bullseye.Dockerfile +++ b/images/runtime/node/22/bullseye.Dockerfile @@ -1,7 +1,7 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bullseye as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/node/24/noble.Dockerfile b/images/runtime/node/24/noble.Dockerfile index 6898377400..88fa23676c 100644 --- a/images/runtime/node/24/noble.Dockerfile +++ b/images/runtime/node/24/noble.Dockerfile @@ -2,7 +2,7 @@ ARG BASE_IMAGE ARG FEED_ACCESSTOKEN # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bullseye as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/php-fpm/8.1/bullseye.Dockerfile b/images/runtime/php-fpm/8.1/bullseye.Dockerfile index 4a2ba63d55..5e4f2ebbbe 100644 --- a/images/runtime/php-fpm/8.1/bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.1/bullseye.Dockerfile @@ -1,7 +1,7 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bullseye as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/php-fpm/8.2/bullseye.Dockerfile b/images/runtime/php-fpm/8.2/bullseye.Dockerfile index b75606816b..0eb5df9f79 100644 --- a/images/runtime/php-fpm/8.2/bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.2/bullseye.Dockerfile @@ -1,7 +1,7 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bullseye as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/php-fpm/8.3/bookworm.Dockerfile b/images/runtime/php-fpm/8.3/bookworm.Dockerfile index 2a3a656810..119c0b0d1c 100644 --- a/images/runtime/php-fpm/8.3/bookworm.Dockerfile +++ b/images/runtime/php-fpm/8.3/bookworm.Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bookworm as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/php-fpm/8.3/bullseye.Dockerfile b/images/runtime/php-fpm/8.3/bullseye.Dockerfile index 42d5bf74dc..3a2720bcf1 100644 --- a/images/runtime/php-fpm/8.3/bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.3/bullseye.Dockerfile @@ -1,7 +1,7 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bullseye as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/php-fpm/8.4/bookworm.Dockerfile b/images/runtime/php-fpm/8.4/bookworm.Dockerfile index 9b10eb8cb8..dfb93bc3de 100644 --- a/images/runtime/php-fpm/8.4/bookworm.Dockerfile +++ b/images/runtime/php-fpm/8.4/bookworm.Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bookworm as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/php-fpm/8.4/bullseye.Dockerfile b/images/runtime/php-fpm/8.4/bullseye.Dockerfile index aa2aa09f8f..a3f6f17c1e 100644 --- a/images/runtime/php-fpm/8.4/bullseye.Dockerfile +++ b/images/runtime/php-fpm/8.4/bullseye.Dockerfile @@ -1,7 +1,7 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bullseye as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/php-fpm/8.5/noble.Dockerfile b/images/runtime/php-fpm/8.5/noble.Dockerfile index f304396fd5..f8a52b0c72 100644 --- a/images/runtime/php-fpm/8.5/noble.Dockerfile +++ b/images/runtime/php-fpm/8.5/noble.Dockerfile @@ -1,6 +1,6 @@ ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bookworm as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/python/noble.Dockerfile b/images/runtime/python/noble.Dockerfile index 8e04f84a82..e67c59bd69 100644 --- a/images/runtime/python/noble.Dockerfile +++ b/images/runtime/python/noble.Dockerfile @@ -2,7 +2,7 @@ ARG OS_FLAVOR ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-bookworm as startupCmdGen # GOPATH is set to "/go" in the base image WORKDIR /go/src diff --git a/images/runtime/python/template.Dockerfile b/images/runtime/python/template.Dockerfile index 4e420d64de..ec1fa16107 100644 --- a/images/runtime/python/template.Dockerfile +++ b/images/runtime/python/template.Dockerfile @@ -2,7 +2,7 @@ ARG DEBIAN_FLAVOR ARG BASE_IMAGE # Startup script generator -FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-${DEBIAN_FLAVOR} as startupCmdGen +FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.3-${DEBIAN_FLAVOR} as startupCmdGen WORKDIR /go/src COPY src/startupscriptgenerator/src . diff --git a/src/startupscriptgenerator/src/common/go.mod b/src/startupscriptgenerator/src/common/go.mod index 72ddec043b..3edb31a220 100644 --- a/src/startupscriptgenerator/src/common/go.mod +++ b/src/startupscriptgenerator/src/common/go.mod @@ -1,6 +1,6 @@ module common -go 1.26.2 +go 1.26.3 require ( github.com/BurntSushi/toml v1.5.0 diff --git a/src/startupscriptgenerator/src/dotnetcore/go.mod b/src/startupscriptgenerator/src/dotnetcore/go.mod index c3244aee03..928f8d5e54 100644 --- a/src/startupscriptgenerator/src/dotnetcore/go.mod +++ b/src/startupscriptgenerator/src/dotnetcore/go.mod @@ -1,6 +1,6 @@ module dotnetcore -go 1.26.2 +go 1.26.3 require github.com/Masterminds/semver v1.5.0 diff --git a/src/startupscriptgenerator/src/hugo/go.mod b/src/startupscriptgenerator/src/hugo/go.mod index a0aabe38cd..3f5f96e104 100644 --- a/src/startupscriptgenerator/src/hugo/go.mod +++ b/src/startupscriptgenerator/src/hugo/go.mod @@ -1,6 +1,6 @@ module hugo -go 1.26.2 +go 1.26.3 replace gopkg.in/yaml.v2 v2.2.1 => gopkg.in/yaml.v2 v2.4.0 diff --git a/src/startupscriptgenerator/src/node/go.mod b/src/startupscriptgenerator/src/node/go.mod index 20db922183..7ab400f890 100644 --- a/src/startupscriptgenerator/src/node/go.mod +++ b/src/startupscriptgenerator/src/node/go.mod @@ -1,6 +1,6 @@ module node -go 1.26.2 +go 1.26.3 require github.com/stretchr/testify v1.10.0 diff --git a/src/startupscriptgenerator/src/php/go.mod b/src/startupscriptgenerator/src/php/go.mod index f40eb2532f..0d93623313 100644 --- a/src/startupscriptgenerator/src/php/go.mod +++ b/src/startupscriptgenerator/src/php/go.mod @@ -1,6 +1,6 @@ module php -go 1.26.2 +go 1.26.3 replace gopkg.in/yaml.v2 v2.2.1 => gopkg.in/yaml.v2 v2.4.0 diff --git a/src/startupscriptgenerator/src/python/go.mod b/src/startupscriptgenerator/src/python/go.mod index 36eb186e91..21bb79d521 100644 --- a/src/startupscriptgenerator/src/python/go.mod +++ b/src/startupscriptgenerator/src/python/go.mod @@ -1,6 +1,6 @@ module python -go 1.26.2 +go 1.26.3 require github.com/stretchr/testify v1.11.1