From 864020e2c3ac13712855a212cf571df4e5a9bf02 Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Thu, 27 Apr 2023 12:25:44 +0200 Subject: [PATCH 1/2] docker: use Jammy as Docker default --- utils/docker/publish_docker.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/docker/publish_docker.sh b/utils/docker/publish_docker.sh index 246a8abf6..6099a9094 100755 --- a/utils/docker/publish_docker.sh +++ b/utils/docker/publish_docker.sh @@ -35,25 +35,25 @@ if [[ -z "${GITHUB_SHA}" ]]; then fi FOCAL_TAGS=( - "next" - "sha-${GITHUB_SHA}" "next-focal" ) 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" "next-jammy" + "sha-${GITHUB_SHA}" "v${PW_VERSION}-jammy" ) if [[ "$RELEASE_CHANNEL" == "stable" ]]; then JAMMY_TAGS+=("jammy") + JAMMY_TAGS+=("latest") + JAMMY_TAGS+=("v${PW_VERSION}") fi tag_and_push() { From c593c5abfa8fa7101afd1fbf4bfeab1e7d243d99 Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Thu, 27 Apr 2023 12:29:25 +0200 Subject: [PATCH 2/2] nit --- utils/docker/publish_docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/docker/publish_docker.sh b/utils/docker/publish_docker.sh index 6099a9094..2b991e11d 100755 --- a/utils/docker/publish_docker.sh +++ b/utils/docker/publish_docker.sh @@ -54,6 +54,7 @@ if [[ "$RELEASE_CHANNEL" == "stable" ]]; then JAMMY_TAGS+=("jammy") JAMMY_TAGS+=("latest") JAMMY_TAGS+=("v${PW_VERSION}") + JAMMY_TAGS+=("v${PW_VERSION}-jammy") fi tag_and_push() {