Merge branch 'master' into 52n-4.2.x

.github/workflows/release.yml

@@ -81,7 +81,7 @@ jobs:
       with:
         image: "geoserver_data"
         branch: ${{ github.ref }}
-        tag: ${{ steps.split.outputs._2 }}
+        tag: ${{ steps.split.outputs._1 }}
         push: true
         username: ${{ secrets.DOCKERHUB_USERNAME }}
         password: ${{ secrets.DOCKERHUB_TOKEN }}

README.md

@@ -14,11 +14,10 @@ The [configurations](https://github.com/GeoNode/geonode-project/tree/master/dock
 
 ## Builds and publishing to Docker Hub
 
-Docker images are built:
+Docker images can be built and published in two ways:
 
-- when a new commit is done to the master branch. This triggers build and updated of the published genode/{image}:latest
-- when a new release is pusblished. Tagging follows the {image}_{tag}, and a new geonode/{image}:{tag} is published.
+- When a new release is pusblished. Tagging follows the {image}#{tag}, and a new geonode/{image}:{tag} is published.
+- Using the manual action workflow
 
 Example:
- - A new commit changes a file under the `docker/geoserver` folder -> `geonode/geoserver:latest` is built and published to Docker Hub
- - A release is done with the tag `postgis_15.1` -> `geonode/postgis:15.1` is built and published to Docker Hub
+ - A release is done with the tag `geoserver#2.23.3-v2` -> `geonode/geooserver:2.23.3-v2` is built and published to Docker Hub

docker/geoserver/Dockerfile

@@ -1,4 +1,4 @@
-ARG IMAGE_VERSION=9.0-jdk11-openjdk-slim-bullseye
+ARG IMAGE_VERSION=9.0.85-jdk11-temurin-focal
 ARG JAVA_HOME=/usr/local/openjdk-11
 FROM tomcat:$IMAGE_VERSION
 LABEL GeoNode Development Team