Merge branch 'stable-3.7'
* stable-3.7:
follow-up to "Add helper script to perform multi-platform..."
Add helper script to perform multi-platform images builds
Change-Id: I45b0af23478d7b737b0653d08f4c1be43ede5fb2
diff --git a/README.md b/README.md
index 21a9e00..b1ef8c6 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@
git checkout v3.3.0
```
-Navigate to either `./almalinux/8` or `./ubuntu/20` to build the almalinux- or ubuntu-based docker
+Navigate to either `./almalinux/9` or `./ubuntu/22` to build the almalinux- or ubuntu-based docker
image, respectively. Then run:
```
diff --git a/almalinux/8/Dockerfile b/almalinux/9/Dockerfile
similarity index 97%
rename from almalinux/8/Dockerfile
rename to almalinux/9/Dockerfile
index f26fa49..6c308be 100644
--- a/almalinux/8/Dockerfile
+++ b/almalinux/9/Dockerfile
@@ -1,4 +1,4 @@
-FROM almalinux:8.6
+FROM almalinux:9.0
MAINTAINER Gerrit Code Review Community
# Add Gerrit packages repository
diff --git a/almalinux/8/Dockerfile-dev b/almalinux/9/Dockerfile-dev
similarity index 98%
rename from almalinux/8/Dockerfile-dev
rename to almalinux/9/Dockerfile-dev
index 33ccee3..a8dda99 100644
--- a/almalinux/8/Dockerfile-dev
+++ b/almalinux/9/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM almalinux:8.6
+FROM almalinux:9.0
MAINTAINER Gerrit Code Review Community
ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war"
diff --git a/almalinux/8/entrypoint.sh b/almalinux/9/entrypoint.sh
similarity index 100%
rename from almalinux/8/entrypoint.sh
rename to almalinux/9/entrypoint.sh
diff --git a/build_multiplatform.sh b/build_multiplatform.sh
index 944978f..ad784f0 100755
--- a/build_multiplatform.sh
+++ b/build_multiplatform.sh
@@ -67,11 +67,11 @@
echo
echo "### Building almalinux multi-platform: [$PLATFORMS] iamges"
-(cd almalinux/8 && docker buildx build --platform "$PLATFORMS" --no-cache -t "$DOCKER_USER:${VERSION}-almalinux8" -t "$DOCKER_USER:$VERSION" "$DESTINATION" .)
+(cd almalinux/9 && docker buildx build --platform "$PLATFORMS" --no-cache -t "$DOCKER_USER:${VERSION}-almalinux8" -t "$DOCKER_USER:$VERSION" "$DESTINATION" .)
echo
echo "### Building ubuntu multi-platform: [$PLATFORMS] iamges"
-(cd ubuntu/20 && docker buildx build --platform "$PLATFORMS" --no-cache -t "$DOCKER_USER:${VERSION}-ubuntu20" "$DESTINATION" .)
+(cd ubuntu/22 && docker buildx build --platform "$PLATFORMS" --no-cache -t "$DOCKER_USER:${VERSION}-ubuntu20" "$DESTINATION" .)
echo
echo "### Removing multi-platform builder"
diff --git a/ubuntu/20/.dockerignore b/ubuntu/22/.dockerignore
similarity index 100%
rename from ubuntu/20/.dockerignore
rename to ubuntu/22/.dockerignore
diff --git a/ubuntu/20/Dockerfile b/ubuntu/22/Dockerfile
similarity index 98%
rename from ubuntu/20/Dockerfile
rename to ubuntu/22/Dockerfile
index 238d805..050fe00 100644
--- a/ubuntu/20/Dockerfile
+++ b/ubuntu/22/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
MAINTAINER Gerrit Code Review Community
# Add Gerrit packages repository
diff --git a/ubuntu/20/Dockerfile-dev b/ubuntu/22/Dockerfile-dev
similarity index 98%
rename from ubuntu/20/Dockerfile-dev
rename to ubuntu/22/Dockerfile-dev
index d6ceead..e261a73 100644
--- a/ubuntu/20/Dockerfile-dev
+++ b/ubuntu/22/Dockerfile-dev
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
MAINTAINER Gerrit Code Review Community
ARG GERRIT_WAR_URL="https://gerrit-ci.gerritforge.com/view/Gerrit/job/Gerrit-bazel-master/lastSuccessfulBuild/artifact/gerrit/bazel-bin/release.war"
diff --git a/ubuntu/20/entrypoint.sh b/ubuntu/22/entrypoint.sh
similarity index 100%
rename from ubuntu/20/entrypoint.sh
rename to ubuntu/22/entrypoint.sh
