Skip to content

Commit 10ea902

Browse files
chore: bump dockerfile to use .NET SDK 10 and drop jammy as its not supported by Microsoft anymore (#3276)
1 parent a538db1 commit 10ea902

5 files changed

Lines changed: 7 additions & 65 deletions

File tree

.github/workflows/test_docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
fail-fast: false
2525
matrix:
26-
flavor: [jammy, noble]
26+
flavor: [noble]
2727
runs-on: [ubuntu-24.04, ubuntu-24.04-arm]
2828
steps:
2929
- uses: actions/checkout@v6

utils/docker/Dockerfile.jammy

Lines changed: 0 additions & 46 deletions
This file was deleted.

utils/docker/Dockerfile.noble

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:8.0-noble
1+
FROM mcr.microsoft.com/dotnet/sdk:10.0-noble
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
ARG TZ=America/Los_Angeles

utils/docker/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -e
33
set +x
44

55
if [[ ($1 == '--help') || ($1 == '-h') || ($1 == '') || ($2 == '') ]]; then
6-
echo "usage: $(basename $0) {--arm64,--amd64} {jammy,noble} playwright:localbuild-noble"
6+
echo "usage: $(basename $0) {--arm64,--amd64} {noble} playwright:localbuild-noble"
77
echo
88
echo "Build Playwright docker image and tag it as 'playwright:localbuild-noble'."
99
echo "Once image is built, you can run it with"

utils/docker/publish_docker.sh

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ else
2121
exit 1
2222
fi
2323

24-
# Ubuntu 22.04
25-
JAMMY_TAGS=(
26-
"v${PW_VERSION}-jammy"
27-
)
2824

2925
# Ubuntu 24.04
3026
NOBLE_TAGS=(
@@ -64,12 +60,10 @@ install_oras_if_needed() {
6460
publish_docker_images_with_arch_suffix() {
6561
local FLAVOR="$1"
6662
local TAGS=()
67-
if [[ "$FLAVOR" == "jammy" ]]; then
68-
TAGS=("${JAMMY_TAGS[@]}")
69-
elif [[ "$FLAVOR" == "noble" ]]; then
63+
if [[ "$FLAVOR" == "noble" ]]; then
7064
TAGS=("${NOBLE_TAGS[@]}")
7165
else
72-
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'jammy' or 'noble'"
66+
echo "ERROR: unknown flavor - $FLAVOR. Must be 'noble'"
7367
exit 1
7468
fi
7569
local ARCH="$2"
@@ -90,12 +84,10 @@ publish_docker_images_with_arch_suffix() {
9084
publish_docker_manifest () {
9185
local FLAVOR="$1"
9286
local TAGS=()
93-
if [[ "$FLAVOR" == "jammy" ]]; then
94-
TAGS=("${JAMMY_TAGS[@]}")
95-
elif [[ "$FLAVOR" == "noble" ]]; then
87+
if [[ "$FLAVOR" == "noble" ]]; then
9688
TAGS=("${NOBLE_TAGS[@]}")
9789
else
98-
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'jammy' or 'noble'"
90+
echo "ERROR: unknown flavor - $FLAVOR. Must be 'noble'"
9991
exit 1
10092
fi
10193

@@ -114,10 +106,6 @@ publish_docker_manifest () {
114106
done
115107
}
116108

117-
publish_docker_images_with_arch_suffix jammy amd64
118-
publish_docker_images_with_arch_suffix jammy arm64
119-
publish_docker_manifest jammy amd64 arm64
120-
121109
publish_docker_images_with_arch_suffix noble amd64
122110
publish_docker_images_with_arch_suffix noble arm64
123111
publish_docker_manifest noble amd64 arm64

0 commit comments

Comments
 (0)