Skip to content

Commit

Permalink
chore: drop Ubuntu 18 bionic Docker images (#1667)
Browse files Browse the repository at this point in the history
  • Loading branch information
mxschmitt committed Nov 30, 2022
1 parent e25107b commit d87e105
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 72 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test_docker.yml
Expand Up @@ -18,7 +18,7 @@ on:
- release-*
jobs:
build:
timeout-minutes: 60
timeout-minutes: 120
runs-on: ubuntu-22.04
strategy:
fail-fast: false
Expand Down
46 changes: 0 additions & 46 deletions utils/docker/Dockerfile.bionic

This file was deleted.

2 changes: 1 addition & 1 deletion utils/docker/build.sh
Expand Up @@ -3,7 +3,7 @@ set -e
set +x

if [[ ($1 == '--help') || ($1 == '-h') || ($1 == '') || ($2 == '') ]]; then
echo "usage: $(basename $0) {--arm64,--amd64} {bionic,focal,jammy} playwright:localbuild-focal"
echo "usage: $(basename $0) {--arm64,--amd64} {focal,jammy} playwright:localbuild-focal"
echo
echo "Build Playwright docker image and tag it as 'playwright:localbuild-focal'."
echo "Once image is built, you can run it with"
Expand Down
33 changes: 9 additions & 24 deletions utils/docker/publish_docker.sh
Expand Up @@ -31,29 +31,22 @@ if [[ -z "${GITHUB_SHA}" ]]; then
exit 1
fi

BIONIC_TAGS=(
"next-bionic"
)
if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
BIONIC_TAGS+=("bionic")
fi

FOCAL_TAGS=(
"next"
"sha-${GITHUB_SHA}"
"next-focal"
)

JAMMY_TAGS=(
"next-jammy"
)

if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
FOCAL_TAGS+=("latest")
FOCAL_TAGS+=("focal")
FOCAL_TAGS+=("v${PW_VERSION}-focal")
FOCAL_TAGS+=("v${PW_VERSION}")
fi

JAMMY_TAGS=(
"next-jammy"
)
if [[ "$RELEASE_CHANNEL" == "stable" ]]; then
JAMMY_TAGS+=("jammy")
JAMMY_TAGS+=("v${PW_VERSION}-jammy")
fi
Expand All @@ -69,14 +62,12 @@ tag_and_push() {
publish_docker_images_with_arch_suffix() {
local FLAVOR="$1"
local TAGS=()
if [[ "$FLAVOR" == "bionic" ]]; then
TAGS=("${BIONIC_TAGS[@]}")
elif [[ "$FLAVOR" == "focal" ]]; then
if [[ "$FLAVOR" == "focal" ]]; then
TAGS=("${FOCAL_TAGS[@]}")
elif [[ "$FLAVOR" == "jammy" ]]; then
TAGS=("${JAMMY_TAGS[@]}")
else
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'bionic', 'focal', or 'jammy'"
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'focal', or 'jammy'"
exit 1
fi
local ARCH="$2"
Expand All @@ -97,14 +88,12 @@ publish_docker_images_with_arch_suffix() {
publish_docker_manifest () {
local FLAVOR="$1"
local TAGS=()
if [[ "$FLAVOR" == "bionic" ]]; then
TAGS=("${BIONIC_TAGS[@]}")
elif [[ "$FLAVOR" == "focal" ]]; then
if [[ "$FLAVOR" == "focal" ]]; then
TAGS=("${FOCAL_TAGS[@]}")
elif [[ "$FLAVOR" == "jammy" ]]; then
TAGS=("${JAMMY_TAGS[@]}")
else
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'bionic', 'focal', or 'jammy'"
echo "ERROR: unknown flavor - $FLAVOR. Must be either 'focal', or 'jammy'"
exit 1
fi

Expand All @@ -123,10 +112,6 @@ publish_docker_manifest () {
done
}

# Bionic
publish_docker_images_with_arch_suffix bionic amd64
publish_docker_manifest bionic amd64

# Focal
publish_docker_images_with_arch_suffix focal amd64
publish_docker_images_with_arch_suffix focal arm64
Expand Down

0 comments on commit d87e105

Please sign in to comment.