Skip to content

Commit d87e105

Browse files
authored
chore: drop Ubuntu 18 bionic Docker images (microsoft#1667)
1 parent e25107b commit d87e105

File tree

4 files changed

+11
-72
lines changed

4 files changed

+11
-72
lines changed

.github/workflows/test_docker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ on:
1818
- release-*
1919
jobs:
2020
build:
21-
timeout-minutes: 60
21+
timeout-minutes: 120
2222
runs-on: ubuntu-22.04
2323
strategy:
2424
fail-fast: false

utils/docker/Dockerfile.bionic

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

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} {bionic,focal,jammy} playwright:localbuild-focal"
6+
echo "usage: $(basename $0) {--arm64,--amd64} {focal,jammy} playwright:localbuild-focal"
77
echo
88
echo "Build Playwright docker image and tag it as 'playwright:localbuild-focal'."
99
echo "Once image is built, you can run it with"

utils/docker/publish_docker.sh

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,22 @@ if [[ -z "${GITHUB_SHA}" ]]; then
3131
exit 1
3232
fi
3333

34-
BIONIC_TAGS=(
35-
"next-bionic"
36-
)
37-
if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
38-
BIONIC_TAGS+=("bionic")
39-
fi
40-
4134
FOCAL_TAGS=(
4235
"next"
4336
"sha-${GITHUB_SHA}"
4437
"next-focal"
4538
)
46-
47-
JAMMY_TAGS=(
48-
"next-jammy"
49-
)
50-
5139
if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
5240
FOCAL_TAGS+=("latest")
5341
FOCAL_TAGS+=("focal")
5442
FOCAL_TAGS+=("v${PW_VERSION}-focal")
5543
FOCAL_TAGS+=("v${PW_VERSION}")
44+
fi
5645

46+
JAMMY_TAGS=(
47+
"next-jammy"
48+
)
49+
if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
5750
JAMMY_TAGS+=("jammy")
5851
JAMMY_TAGS+=("v${PW_VERSION}-jammy")
5952
fi
@@ -69,14 +62,12 @@ tag_and_push() {
6962
publish_docker_images_with_arch_suffix() {
7063
local FLAVOR="$1"
7164
local TAGS=()
72-
if [[ "$FLAVOR" == "bionic" ]]; then
73-
TAGS=("${BIONIC_TAGS[@]}")
74-
elif [[ "$FLAVOR" == "focal" ]]; then
65+
if [[ "$FLAVOR" == "focal" ]]; then
7566
TAGS=("${FOCAL_TAGS[@]}")
7667
elif [[ "$FLAVOR" == "jammy" ]]; then
7768
TAGS=("${JAMMY_TAGS[@]}")
7869
else
79-
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'bionic', 'focal', or 'jammy'"
70+
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'focal', or 'jammy'"
8071
exit 1
8172
fi
8273
local ARCH="$2"
@@ -97,14 +88,12 @@ publish_docker_images_with_arch_suffix() {
9788
publish_docker_manifest () {
9889
local FLAVOR="$1"
9990
local TAGS=()
100-
if [[ "$FLAVOR" == "bionic" ]]; then
101-
TAGS=("${BIONIC_TAGS[@]}")
102-
elif [[ "$FLAVOR" == "focal" ]]; then
91+
if [[ "$FLAVOR" == "focal" ]]; then
10392
TAGS=("${FOCAL_TAGS[@]}")
10493
elif [[ "$FLAVOR" == "jammy" ]]; then
10594
TAGS=("${JAMMY_TAGS[@]}")
10695
else
107-
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'bionic', 'focal', or 'jammy'"
96+
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'focal', or 'jammy'"
10897
exit 1
10998
fi
11099

@@ -123,10 +112,6 @@ publish_docker_manifest () {
123112
done
124113
}
125114

126-
# Bionic
127-
publish_docker_images_with_arch_suffix bionic amd64
128-
publish_docker_manifest bionic amd64
129-
130115
# Focal
131116
publish_docker_images_with_arch_suffix focal amd64
132117
publish_docker_images_with_arch_suffix focal arm64

0 commit comments

Comments
 (0)