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.25.7-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.1-bullseye bash -c \
"cp -rf $GEN_DIR_CONTAINER_RO/* $GEN_DIR_CONTAINER && \
cd $GEN_DIR_CONTAINER && \
chmod u+x restorePackages.sh && \
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.25.7-bookworm AS startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-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.25.7-bookworm AS startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-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.25.7-bullseye AS startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-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.25.7-bookworm AS startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-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.25.7-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-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.25.7-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-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.25.7-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-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.25.7-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-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.25.7-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-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.25.7-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
20 changes: 5 additions & 15 deletions 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.25.7-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down Expand Up @@ -371,21 +371,11 @@ RUN set -eux; \
# Install the Microsoft SQL Server PDO driver on supported versions only.
# - https://docs.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac
# - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server
# For php|8.0, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.11.0
# For php|8.1, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.12.0
RUN set -eux; \
if [[ $PHP_VERSION == 8.0.* ]]; then \
pecl install sqlsrv-5.11.0 pdo_sqlsrv-5.11.0 \
&& echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/30-pdo_sqlsrv.ini \
&& echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/20-sqlsrv.ini; \
fi

# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0)
RUN set -eux; \
if [[ $PHP_VERSION == 8.1.* || $PHP_VERSION == 8.2.* || $PHP_VERSION == 8.3.* ]]; then \
pecl install sqlsrv pdo_sqlsrv \
&& echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
&& echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini; \
fi
pecl install sqlsrv-5.12.0 pdo_sqlsrv-5.12.0 \
&& echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
&& echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini


RUN { \
Expand Down
20 changes: 5 additions & 15 deletions 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.25.7-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down Expand Up @@ -371,21 +371,11 @@ RUN set -eux; \
# Install the Microsoft SQL Server PDO driver on supported versions only.
# - https://docs.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac
# - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server
# For php|8.0, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.11.0
# For php|8.2, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.12.0
RUN set -eux; \
if [[ $PHP_VERSION == 8.0.* ]]; then \
pecl install sqlsrv-5.11.0 pdo_sqlsrv-5.11.0 \
&& echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/30-pdo_sqlsrv.ini \
&& echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/20-sqlsrv.ini; \
fi

# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0)
RUN set -eux; \
if [[ $PHP_VERSION == 8.1.* || $PHP_VERSION == 8.2.* || $PHP_VERSION == 8.3.* ]]; then \
pecl install sqlsrv pdo_sqlsrv \
&& echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
&& echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini; \
fi
pecl install sqlsrv-5.12.0 pdo_sqlsrv-5.12.0 \
&& echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
&& echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini


RUN { \
Expand Down
20 changes: 5 additions & 15 deletions 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.25.7-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bookworm as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down Expand Up @@ -365,21 +365,11 @@ RUN set -eux; \
# Install the Microsoft SQL Server PDO driver on supported versions only.
# - https://docs.microsoft.com/en-us/sql/connect/php/installation-tutorial-linux-mac
# - https://docs.microsoft.com/en-us/sql/connect/odbc/linux-mac/installing-the-microsoft-odbc-driver-for-sql-server
# For php|8.0, latest stable version of pecl/sqlsrv, pecl/pdo_sqlsrv is 5.11.0
# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.3.0)
RUN set -eux; \
if [[ $PHP_VERSION == 8.0.* ]]; then \
pecl install sqlsrv-5.11.0 pdo_sqlsrv-5.11.0 \
&& echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/30-pdo_sqlsrv.ini \
&& echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||")/20-sqlsrv.ini; \
fi

# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0)
RUN set -eux; \
if [[ $PHP_VERSION == 8.1.* || $PHP_VERSION == 8.2.* || $PHP_VERSION == 8.3.* ]]; then \
pecl install sqlsrv pdo_sqlsrv \
&& echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
&& echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini; \
fi
pecl install sqlsrv pdo_sqlsrv \
&& echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
&& echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini


RUN { \
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.25.7-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down
4 changes: 2 additions & 2 deletions 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.25.7-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bookworm as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down Expand Up @@ -349,7 +349,7 @@ RUN pecl install redis && docker-php-ext-enable redis
RUN set -eux; \
pecl install mongodb && docker-php-ext-enable mongodb

# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0)
# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.3.0)
RUN set -eux; \
pecl install sqlsrv pdo_sqlsrv \
&& echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
Expand Down
4 changes: 2 additions & 2 deletions 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.25.7-bullseye as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bullseye as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down Expand Up @@ -352,7 +352,7 @@ RUN pecl install redis && docker-php-ext-enable redis
RUN set -eux; \
pecl install mongodb && docker-php-ext-enable mongodb

# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.1.0)
# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.3.0)
RUN set -eux; \
pecl install sqlsrv pdo_sqlsrv \
&& echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
Expand Down
17 changes: 6 additions & 11 deletions 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.25.7-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bookworm as startupCmdGen

# GOPATH is set to "/go" in the base image
WORKDIR /go/src
Expand Down Expand Up @@ -348,16 +348,11 @@ RUN pecl install redis && docker-php-ext-enable redis
RUN set -eux; \
pecl install mongodb && docker-php-ext-enable mongodb

# NOTE: sqlsrv and pdo_sqlsrv are commented out because they don't support PHP 8.5 yet.
# Microsoft's drivers (5.12.0) target PHP 8.0-8.4 and fail to compile against PHP 8.5 internal APIs.
# For SQL Server connectivity, use pdo_odbc instead (already installed above):
# $pdo = new PDO("odbc:Driver={ODBC Driver 18 for SQL Server};Server=myserver;Database=mydb", $user, $pass);
#
# RUN set -eux; \
# pecl install sqlsrv pdo_sqlsrv \
# && echo extension=pdo_sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/30-pdo_sqlsrv.ini \
# && echo extension=sqlsrv.so >> `php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||"`/20-sqlsrv.ini

# Latest pecl/sqlsrv, pecl/pdo_sqlsrv requires PHP (version >= 8.3.0)
RUN set -eux; \
pecl install sqlsrv pdo_sqlsrv \
&& echo extension=pdo_sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||" -e "s/\"//g")/30-pdo_sqlsrv.ini \
&& echo extension=sqlsrv.so >> $(php --ini | grep "Scan for additional .ini files" | sed -e "s|.*:\s*||" -e "s/\"//g")/20-sqlsrv.ini

RUN { \
echo 'opcache.memory_consumption=128'; \
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.25.7-bookworm as startupCmdGen
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-bookworm as startupCmdGen

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

# Startup script generator
# Using 1.20 golang image because golang latest image is not supported for buster, so using 1.20 golang image and then updating it.
# TODO: Once buster gets deprecated, update the golang base image
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.20-${DEBIAN_FLAVOR} as startupCmdGen

# Download and install the latest version of Go
RUN curl -OL https://go.dev/dl/go1.25.7.linux-amd64.tar.gz && \
rm -rf /usr/local/go && \
tar -C /usr/local -xzf go1.25.7.linux-amd64.tar.gz && \
rm go1.25.7.linux-amd64.tar.gz
ENV PATH=$PATH:/usr/local/go/bin
# Verify the installation
RUN go version
# GOPATH is set to "/go" in the base image
FROM mcr.microsoft.com/oss/go/microsoft/golang:1.26.1-${DEBIAN_FLAVOR} as startupCmdGen

WORKDIR /go/src
COPY src/startupscriptgenerator/src .
ARG GIT_COMMIT=unspecified
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.25.7
go 1.26.1

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.25.7
go 1.26.1

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.25.7
go 1.26.1

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.25.7
go 1.26.1

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.25.7
go 1.26.1

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.25.7
go 1.26.1

require github.com/stretchr/testify v1.11.1

Expand Down
23 changes: 23 additions & 0 deletions tests/Oryx.RuntimeImage.Tests/Php-fpm/PhpFpmImageTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,29 @@ public void SqlSrv_IsInstalled_For_Bookworm(string version)
result.GetDebugInfo());
}

[Theory]
[Trait("category", "runtime-noble")]
[InlineData("8.5-fpm")]
public void SqlSrv_IsInstalled_For_Noble(string version)
{
// Arrange & Act
var result = _dockerCli.Run(new DockerRunArguments
{
ImageId = _imageHelper.GetRuntimeImage("php", version, ImageTestHelperConstants.OsTypeUbuntuNoble),
CommandToExecuteOnRun = "php",
CommandArguments = new[] { "-m", " | grep pdo_sqlsrv);" }
});

// Assert
var output = result.StdOut.ToString();
RunAsserts(() =>
{
Assert.True(result.IsSuccess);
Assert.Contains("pdo_sqlsrv", output);
},
result.GetDebugInfo());
}

[Theory]
[Trait("category", "runtime-bullseye")]
[InlineData("8.1-fpm")]
Expand Down
Loading