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
2 changes: 1 addition & 1 deletion build/testStartupScriptGenerators.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-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.2-bullseye bash -c \
"cp -rf $GEN_DIR_CONTAINER_RO/* $GEN_DIR_CONTAINER && \
cd $GEN_DIR_CONTAINER && \
chmod u+x restorePackages.sh && \
Expand Down
1 change: 0 additions & 1 deletion images/constants.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ variables:
node20osFlavors: bullseye,bookworm
node22osFlavors: bullseye,bookworm
node24osFlavors: noble
python39osFlavors: bullseye
python310osFlavors: bullseye
python311osFlavors: bullseye,bookworm
python312osFlavors: bullseye,bookworm
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/dotnetcore/10.0/noble.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-bookworm AS startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm AS startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/dotnetcore/8.0/bookworm.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-bookworm AS startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm AS startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/dotnetcore/8.0/bullseye.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-bullseye AS startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye AS startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/dotnetcore/9.0/bookworm.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.1-bookworm AS startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm AS startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/node/18/bullseye.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/node/20/bookworm.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/node/20/bullseye.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/node/22/bookworm.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/node/22/bullseye.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/node/24/noble.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG BASE_IMAGE
ARG FEED_ACCESSTOKEN

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/php-fpm/8.1/bullseye.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/php-fpm/8.2/bullseye.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/php-fpm/8.3/bookworm.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BASE_IMAGE
# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/php-fpm/8.3/bullseye.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/php-fpm/8.4/bookworm.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BASE_IMAGE
# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/php-fpm/8.4/bullseye.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/php-fpm/8.5/noble.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ARG BASE_IMAGE
# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
2 changes: 1 addition & 1 deletion images/runtime/python/noble.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG OS_FLAVOR
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-bookworm as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
4 changes: 2 additions & 2 deletions images/runtime/python/template.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG DEBIAN_FLAVOR
ARG BASE_IMAGE

# Startup script generator
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-${DEBIAN_FLAVOR} as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.2-${DEBIAN_FLAVOR} as startupCmdGen

WORKDIR /go/src
COPY src/startupscriptgenerator/src .
Expand Down Expand Up @@ -90,7 +90,7 @@ RUN ${IMAGES_DIR}/runtime/python/install-dependencies.sh
RUN --mount=type=secret,id=pip_index_url,target=/run/secrets/pip_index_url \
pip install --index-url $(cat /run/secrets/pip_index_url) --upgrade pip && \
pip install --index-url $(cat /run/secrets/pip_index_url) gunicorn debugpy viztracer==0.15.6 vizplugins==0.1.3 && \
if [ "${PYTHON_VERSION}" != "3.12" ] && [ "${PYTHON_VERSION}" != "3.7" ]; then pip install --index-url $(cat /run/secrets/pip_index_url) orjson==3.10.7; fi && \
if [ "${PYTHON_VERSION}" != "3.12" ] && [ "${PYTHON_VERSION}" != "3.7" ]; then pip install --index-url $(cat /run/secrets/pip_index_url) orjson==3.11.8; fi && \
if [ "${PYTHON_VERSION}" = "3.7" ] || [ "${PYTHON_VERSION}" = "3.8" ]; then curl -LO http://ftp.de.debian.org/debian/pool/main/libf/libffi/libffi6_3.2.1-9_amd64.deb \
&& dpkg -i libffi6_3.2.1-9_amd64.deb \
&& rm libffi6_3.2.1-9_amd64.deb; fi && \
Expand Down
2 changes: 1 addition & 1 deletion src/startupscriptgenerator/src/common/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module common

go 1.26.1
go 1.26.2

require (
github.com/BurntSushi/toml v1.5.0
Expand Down
2 changes: 1 addition & 1 deletion src/startupscriptgenerator/src/dotnetcore/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module dotnetcore

go 1.26.1
go 1.26.2

require github.com/Masterminds/semver v1.5.0

Expand Down
2 changes: 1 addition & 1 deletion src/startupscriptgenerator/src/hugo/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module hugo

go 1.26.1
go 1.26.2

replace gopkg.in/yaml.v2 v2.2.1 => gopkg.in/yaml.v2 v2.4.0

Expand Down
2 changes: 1 addition & 1 deletion src/startupscriptgenerator/src/node/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module node

go 1.26.1
go 1.26.2

require github.com/stretchr/testify v1.10.0

Expand Down
2 changes: 1 addition & 1 deletion src/startupscriptgenerator/src/php/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module php

go 1.26.1
go 1.26.2

replace gopkg.in/yaml.v2 v2.2.1 => gopkg.in/yaml.v2 v2.4.0

Expand Down
2 changes: 1 addition & 1 deletion src/startupscriptgenerator/src/python/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module python

go 1.26.1
go 1.26.2

require github.com/stretchr/testify v1.11.1

Expand Down
3 changes: 0 additions & 3 deletions tests/Oryx.RuntimeImage.Tests/Python/PythonImagesTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ public PythonImagesTest(ITestOutputHelper output) : base(output)

[Theory]
[Trait("category", "runtime-bullseye")]
[InlineData("3.9")]
[InlineData("3.10")]
[InlineData("3.11")]
[InlineData("3.12")]
Expand Down Expand Up @@ -101,7 +100,6 @@ public void PythonBookwormRuntimeImage_Contains_VersionAndCommit_Information(str

[Theory]
[Trait("category", "runtime-bullseye")]
[InlineData("3.9")]
[InlineData("3.10")]
[InlineData("3.11")]
[InlineData("3.12")]
Expand Down Expand Up @@ -191,7 +189,6 @@ public void PythonVersionMatchesBookwormImageName(string pythonVersion, string e

public static IEnumerable<object[]> BullseyePythonVersionTestData => new[]
{
new object[] { "3.9", "Python " + PythonVersions.Python39Version },
new object[] { "3.10", "Python " + PythonVersions.Python310Version },
new object[] { "3.11", "Python " + PythonVersions.Python311Version },
new object[] { "3.12", "Python " + PythonVersions.Python312Version },
Expand Down
Loading