From d5bfa745d4affbb9a9e8b6a6b6e1068e9159417d Mon Sep 17 00:00:00 2001 From: Giovanni Allegri Date: Thu, 1 Jun 2023 15:11:24 +0200 Subject: [PATCH] Revert "Bump to Geoserver 2.23.1 (#435) (#436)" This reverts commit 940c2f50742a82ba057be94ed5c2f487f2fd726b. --- dev_config.yml | 4 ++-- docker-compose.yml | 4 ++-- docker/geoserver/Dockerfile | 2 +- docker/geoserver/docker-compose.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dev_config.yml b/dev_config.yml index b6c89644..3fa02cd7 100644 --- a/dev_config.yml +++ b/dev_config.yml @@ -1,6 +1,6 @@ --- -GEOSERVER_URL: "https://artifacts.geonode.org/geoserver/2.23.1/geoserver.war" -DATA_DIR_URL: "https://artifacts.geonode.org/geoserver/2.23.1/geonode-geoserver-ext-web-app-data.zip" +GEOSERVER_URL: "https://artifacts.geonode.org/geoserver/2.23.0/geoserver.war" +DATA_DIR_URL: "https://artifacts.geonode.org/geoserver/2.23.0/geonode-geoserver-ext-web-app-data.zip" JETTY_RUNNER_URL: "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.31.v20200723/jetty-runner-9.4.31.v20200723.jar" WINDOWS: py2exe: "http://downloads.sourceforge.net/project/py2exe/py2exe/0.6.9/py2exe-0.6.9.win32-py2.7.exe" diff --git a/docker-compose.yml b/docker-compose.yml index 0aefc610..34b1edb8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -89,7 +89,7 @@ services: # Geoserver backend geoserver: - image: geonode/geoserver:2.23.1 + image: geonode/geoserver:2.23.0 build: ./docker/geoserver/ container_name: geoserver4${COMPOSE_PROJECT_NAME} healthcheck: @@ -116,7 +116,7 @@ services: condition: service_healthy data-dir-conf: - image: geonode/geoserver_data:2.23.1 + image: geonode/geoserver_data:2.23.0 container_name: gsconf4${COMPOSE_PROJECT_NAME} entrypoint: sleep infinity volumes: diff --git a/docker/geoserver/Dockerfile b/docker/geoserver/Dockerfile index 52ea1ed6..a0fa3dcc 100644 --- a/docker/geoserver/Dockerfile +++ b/docker/geoserver/Dockerfile @@ -10,7 +10,7 @@ ARG GEOSERVER_CORS_ALLOWED_HEADERS=* # # Set GeoServer version and data directory # -ENV GEOSERVER_VERSION=2.23.1 +ENV GEOSERVER_VERSION=2.23.0 ENV GEOSERVER_DATA_DIR="/geoserver_data/data" ENV GEOSERVER_CORS_ENABLED=$GEOSERVER_CORS_ENABLED ENV GEOSERVER_CORS_ALLOWED_ORIGINS=$GEOSERVER_CORS_ALLOWED_ORIGINS diff --git a/docker/geoserver/docker-compose.yml b/docker/geoserver/docker-compose.yml index 3bb1a60c..d743add9 100644 --- a/docker/geoserver/docker-compose.yml +++ b/docker/geoserver/docker-compose.yml @@ -15,7 +15,7 @@ services: restart: on-failure geoserver: - image: geonode/geoserver:2.23.1 + image: geonode/geoserver:2.23.0 build: context: . args: @@ -47,7 +47,7 @@ services: restart: on-failure data-dir-conf: - image: geonode/geoserver_data:2.23.1 + image: geonode/geoserver_data:2.23.0 container_name: geoserver_data_dir # named data container entrypoint: sleep infinity volumes: