From df6bc9e2d76dea1f375771701cc8801bdbba0c46 Mon Sep 17 00:00:00 2001 From: mazano Date: Mon, 25 Nov 2024 10:09:30 +0200 Subject: [PATCH] publish 2.26.1 and fix actions (#703) * Publish v2.26.1 --- .env | 6 +++--- .github/workflows/build-latest.yaml | 6 +++--- .github/workflows/deploy-image.yaml | 11 ++++++----- Dockerfile | 4 ++-- README.md | 28 ++++++++++++++-------------- clustering/docker-compose.yml | 6 +++--- docker-compose.yml | 4 ++-- upgrade_geoserver_version.sh | 2 +- 8 files changed, 34 insertions(+), 33 deletions(-) diff --git a/.env b/.env index 589c1a26..a16e406f 100644 --- a/.env +++ b/.env @@ -3,9 +3,9 @@ COMPOSE_PROJECT_NAME=kartozageoserver # Build Arguments # ############### IMAGE_VERSION=9.0.91-jdk17-temurin-focal -GS_VERSION=2.26.0 +GS_VERSION=2.26.1 JAVA_HOME=/opt/java/openjdk -WAR_URL=http://downloads.sourceforge.net/project/geoserver/GeoServer/2.26.0/geoserver-2.26.0-war.zip +WAR_URL=http://downloads.sourceforge.net/project/geoserver/GeoServer/2.26.1/geoserver-2.26.1-war.zip STABLE_PLUGIN_BASE_URL=https://sourceforge.net/projects/geoserver/files/GeoServer GEOSERVER_UID=1000 GEOSERVER_GID=10001 @@ -150,7 +150,7 @@ LOGGING_STDOUT=true # Based of [https://github.com/kartoza/docker-postgis](kartoza/postgis) # ##################################################################### -POSTGIS_VERSION_TAG=16-3.4 +POSTGIS_VERSION_TAG=17-3.5 POSTGRES_DB=gis,gwc POSTGRES_USER=docker POSTGRES_PASS=docker diff --git a/.github/workflows/build-latest.yaml b/.github/workflows/build-latest.yaml index 82365efe..171d6485 100644 --- a/.github/workflows/build-latest.yaml +++ b/.github/workflows/build-latest.yaml @@ -69,11 +69,11 @@ jobs: geoserverMajorVersion: - 2 imageVersion: - - image: 9.0.91-jdk11-temurin-focal + - image: 9.0.91-jdk17-temurin-focal javaHome: /opt/java/openjdk geoserverMinorVersion: - - minor: 25 - patch: 4 + - minor: 26 + patch: 1 stablePluginBaseURL: - https://sourceforge.net/projects/geoserver/files/GeoServer steps: diff --git a/.github/workflows/deploy-image.yaml b/.github/workflows/deploy-image.yaml index b66984ce..8e0c36bc 100644 --- a/.github/workflows/deploy-image.yaml +++ b/.github/workflows/deploy-image.yaml @@ -27,11 +27,11 @@ jobs: geoserverMajorVersion: - 2 imageVersion: - - image: 9.0.91-jdk11-temurin-focal + - image: 9.0.91-jdk17-temurin-focal javaHome: /opt/java/openjdk geoserverMinorVersion: - - minor: 25 - patch: 4 + - minor: 26 + patch: 1 stablePluginBaseURL: # empty because it often changes, so it's better # to use the default one described in the Dockerfile @@ -78,6 +78,7 @@ jobs: file: Dockerfile push: true tags: | + ${{ secrets.DOCKERHUB_REPO }}/geoserver ${{ steps.check_hub_image_exists.outputs.check_image == 200 && format('{0}/geoserver:{1}.{2}.{3}', secrets.DOCKERHUB_REPO, matrix.geoserverMajorVersion, matrix.geoserverMinorVersion.minor, matrix.geoserverMinorVersion.patch) || null}} ${{ secrets.DOCKERHUB_REPO }}/geoserver:${{ matrix.geoserverMajorVersion }}.${{ matrix.geoserverMinorVersion.minor }}.${{ matrix.geoserverMinorVersion.patch }} ${{ secrets.DOCKERHUB_REPO }}/geoserver:${{ matrix.geoserverMajorVersion }}.${{ matrix.geoserverMinorVersion.minor }}.${{ matrix.geoserverMinorVersion.patch }}--v${{ steps.current_date.outputs.formatted }} @@ -108,8 +109,8 @@ jobs: geoserverMajorVersion: - 2 geoserverMinorVersion: - - minor: 25 - patch: 4 + - minor: 26 + patch: 1 steps: - name: Checkout code id: git_checkout diff --git a/Dockerfile b/Dockerfile index c58a0ac1..0cc5e0d3 100755 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ ARG JAVA_HOME=/opt/java/openjdk # alpine because it's smaller. FROM --platform=$BUILDPLATFORM python:alpine3.20 AS geoserver-plugin-downloader -ARG GS_VERSION=2.26.0 +ARG GS_VERSION=2.26.1 ARG STABLE_PLUGIN_BASE_URL=https://sourceforge.net/projects/geoserver/files/GeoServer ARG WAR_URL=https://downloads.sourceforge.net/project/geoserver/GeoServer/${GS_VERSION}/geoserver-${GS_VERSION}-war.zip @@ -49,7 +49,7 @@ RUN /work/plugin_download.sh FROM tomcat:$IMAGE_VERSION AS geoserver-prod LABEL maintainer="Tim Sutton" -ARG GS_VERSION=2.26.0 +ARG GS_VERSION=2.26.1 ARG STABLE_PLUGIN_BASE_URL=https://sourceforge.net/projects/geoserver/files/GeoServer ARG HTTPS_PORT=8443 ARG ACTIVATE_GDAL_PLUGIN=true diff --git a/README.md b/README.md index fbc79cc9..4019087c 100755 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ The preferred way (but using the most bandwidth for the initial image) is to get our docker-trusted build like this: ``` shell -VERSION=2.26.0 +VERSION=2.26.1 docker pull kartoza/geoserver:$VERSION ``` **Note** Although the images are tagged and backed by unit tests @@ -100,14 +100,14 @@ See the [dockerhub tomcat](https://hub.docker.com/_/tomcat/) for available tags. ``` -VERSION=2.26.0 +VERSION=2.26.1 IMAGE_VERSION=9.0.91-jdk11-temurin-focal docker build --build-arg IMAGE_VERSION=${IMAGE_VERSION} --build-arg GS_VERSION=${VERSION} -t kartoza/geoserver:${VERSION} . ``` For some recent builds, it is necessary to set the JAVA_PATH as well (e.g. Apache Tomcat/9.0.36) ``` -docker build --build-arg IMAGE_VERSION=9.0.91-jdk11-temurin-focal --build-arg JAVA_HOME=/usr/local/openjdk-11/bin/java --build-arg GS_VERSION=2.26.0 -t kartoza/geoserver:2.26.0 . +docker build --build-arg IMAGE_VERSION=9.0.91-jdk11-temurin-focal --build-arg JAVA_HOME=/usr/local/openjdk-11/bin/java --build-arg GS_VERSION=2.26.1 -t kartoza/geoserver:2.26.1 . ``` **Note:** Please check the [GeoServer documentation](https://docs.geoserver.org/stable/en/user/production/index.html) @@ -195,9 +195,9 @@ will be enabled : [list of default plugins](https://github.com/kartoza/docker-ge #### Activate stable extensions during the contain startup The environment variable `STABLE_EXTENSIONS` is used to activate extensions listed in -[stable_plugins](https://sourceforge.net/projects/geoserver/files/GeoServer/2.26.0/extensions/) +[stable_plugins](https://sourceforge.net/projects/geoserver/files/GeoServer/2.26.1/extensions/) -**Note:** The plugins listed in the url is of the format `geoserver-2.26.0-wps-plugin.zip`, but the env +**Note:** The plugins listed in the url is of the format `geoserver-2.26.1-wps-plugin.zip`, but the env variable expects the env to be of the format `wps-plugin`. Always consult the url to see which plugins are available. The text file [stable_plugins.txt](https://github.com/kartoza/docker-geoserver/blob/master/build_data/stable_plugins.txt) contains a curated list of plugins but might be out of date in some cases. @@ -205,11 +205,11 @@ contains a curated list of plugins but might be out of date in some cases. Example ``` -ie VERSION=2.26.0 +ie VERSION=2.26.1 docker run -d -p 8600:8080 --name geoserver -e STABLE_EXTENSIONS=charts-plugin,db2-plugin kartoza/geoserver:${VERSION} ``` -You can pass any comma-separated extensions as defined in [stable_plugins](https://sourceforge.net/projects/geoserver/files/GeoServer/2.26.0/extensions/) +You can pass any comma-separated extensions as defined in [stable_plugins](https://sourceforge.net/projects/geoserver/files/GeoServer/2.26.1/extensions/) #### Activate community extensions during contain startup @@ -224,7 +224,7 @@ contains a curated list of community plugins but might be out of date in some ca Example ``` -ie VERSION=2.26.0 +ie VERSION=2.26.1 docker run -d -p 8600:8080 --name geoserver -e COMMUNITY_EXTENSIONS=gwc-sqlite-plugin,ogr-datastore-plugin kartoza/geoserver:${VERSION} ``` @@ -240,7 +240,7 @@ following the guidelines from [GeoServer develop guidelines](https://docs.geoser The image ships with sample data. This can be used to familiarize yourself with GeoServer. This is not activated by default. You can activate it using the environment variable `boolean SAMPLE_DATA`. ``` -ie VERSION=2.26.0 +ie VERSION=2.26.1 docker run -d -p 8600:8080 --name geoserver -e SAMPLE_DATA=true kartoza/geoserver:${VERSION} ``` @@ -309,14 +309,14 @@ If you set the environment variable `SSL=true` but do not provide the pem files the container will generate self-signed SSL certificates. ``` -ie VERSION=2.26.0 +ie VERSION=2.26.1 docker run -it --name geoserver -e PKCS12_PASSWORD=geoserver -e JKS_KEY_PASSWORD=geoserver -e JKS_STORE_PASSWORD=geoserver -e SSL=true -p 8443:8443 -p 8600:8080 kartoza/geoserver:${VERSION} ``` If you already have your perm files (`fullchain.pem` and `privkey.pem`) you can mount the directory containing your keys as: ``` -ie VERSION=2.26.0 +ie VERSION=2.26.1 docker run -it --name geo -v /etc/certs:/etc/certs -e PKCS12_PASSWORD=geoserver -e JKS_KEY_PASSWORD=geoserver -e JKS_STORE_PASSWORD=geoserver -e SSL=true -p 8443:8443 -p 8600:8080 kartoza/geoserver:${VERSION} ``` @@ -374,7 +374,7 @@ To include Tomcat extras including docs, examples, and the manager web app, set to use a strong password otherwise a randomly generated password is used. ``` -ie VERSION=2.26.0 +ie VERSION=2.26.1 docker run -it --name geoserver -e TOMCAT_EXTRAS=true -p 8600:8080 kartoza/geoserver:${VERSION} ``` @@ -398,7 +398,7 @@ If you have downloaded extra fonts you can mount the folder to the path path during initialisation. This is useful for styling layers i.e. labeling using specific fonts. ``` -ie VERSION=2.26.0 +ie VERSION=2.26.1 docker run -v fonts:/opt/fonts -p 8080:8080 -t kartoza/geoserver:${VERSION} ``` @@ -408,7 +408,7 @@ You can use the environment variable `GOOGLE_FONTS_NAMES` to activate fonts defi i.e. ```bash -ie VERSION=2.26.0 +ie VERSION=2.26.1 docker run -e GOOGLE_FONTS_NAMES=actor,akronim -p 8080:8080 -t kartoza/geoserver:${VERSION} ``` diff --git a/clustering/docker-compose.yml b/clustering/docker-compose.yml index 550552dd..de265838 100644 --- a/clustering/docker-compose.yml +++ b/clustering/docker-compose.yml @@ -6,7 +6,7 @@ volumes: services: db: - image: kartoza/postgis:16-3.4 + image: kartoza/postgis:17-3.5 volumes: - geo-db-data:/var/lib/postgresql environment: @@ -19,7 +19,7 @@ services: healthcheck: test: "PGPASSWORD=docker pg_isready -h 127.0.0.1 -U docker -d gis" master: - image: kartoza/geoserver:2.26.0 + image: kartoza/geoserver:2.26.1 volumes: - geoserver-cluster-data:/opt/geoserver/data_dir - geoserver-cluster-gwc-data:/opt/geoserver/gwc @@ -54,7 +54,7 @@ services: timeout: 10s retries: 3 node: - image: kartoza/geoserver:2.26.0 + image: kartoza/geoserver:2.26.1 volumes: - geoserver-cluster-data:/opt/geoserver/data_dir - geoserver-cluster-gwc-data:/opt/geoserver/gwc diff --git a/docker-compose.yml b/docker-compose.yml index 9ba8ba4d..9c86d0d3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: volumes: - geo-db-data:/var/lib/postgresql ports: - - ${POSTGRES_PORT}:5432 + - "${POSTGRES_PORT}:5432" environment: - POSTGRES_DB=${POSTGRES_DB} - POSTGRES_USER=${POSTGRES_USER} @@ -28,7 +28,7 @@ services: volumes: - geoserver-data:/opt/geoserver/data_dir ports: - - ${GEOSERVER_PORT}:8080 + - "${GEOSERVER_PORT}:8080" restart: on-failure environment: - GEOSERVER_DATA_DIR=${GEOSERVER_DATA_DIR} diff --git a/upgrade_geoserver_version.sh b/upgrade_geoserver_version.sh index 721b7c44..35c9cdfd 100755 --- a/upgrade_geoserver_version.sh +++ b/upgrade_geoserver_version.sh @@ -26,5 +26,5 @@ sed -i '' "s/minor: .*/minor: $MINOR/g; s/patch: .*/patch: $BUGFIX/g" .github/wo sed -i '' "s/minor: .*/minor: $MINOR/g; s/patch: .*/patch: $BUGFIX/g" .github/workflows//build-latest.yaml -git commit -a -m "Upgraded GeoServer from version ${GS_VERSION} to ${GS_NEW_VERSION}" +git commit -a -m "Upgraded the GeoServer instance from version ${GS_VERSION} to ${GS_NEW_VERSION}"