- Bump GeoServer to version 2.18.2 (GeoNode#7000)

fvicent · Mar 4, 2021 · 9bd16e7 · 9bd16e7
1 parent 70f93bd
commit 9bd16e7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/dev_config.yml b/dev_config.yml
@@ -1,6 +1,6 @@
 ---
-GEOSERVER_URL: "https://www.dropbox.com/s/a0m1ugxtso8xtyf/geoserver-2.17.4.war?dl=1"
-DATA_DIR_URL: "https://www.dropbox.com/s/sebw3h90mtvnzwe/data-2.17.4.zip?dl=1"
+GEOSERVER_URL: "https://www.dropbox.com/s/xlich7pmneaupqp/geoserver-2.18.2.war?dl=1"
+DATA_DIR_URL: "https://www.dropbox.com/s/q0qc2t7d9alo9fk/data-2.18.2.zip?dl=1"
 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-geoserver-server.yml b/docker-compose-geoserver-server.yml
@@ -2,7 +2,7 @@ version: '2.2'
 services:
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.17.4
+    image: geonode/geoserver_data:2.18.2
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:
@@ -13,7 +13,7 @@ services:
       - geoserver-data-dir:/geoserver_data/data
 
   geoserver:
-    image: geonode/geoserver:2.17.4
+    image: geonode/geoserver:2.18.2
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true

diff --git a/docker-compose-test.yml b/docker-compose-test.yml
@@ -82,7 +82,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.17.4
+    image: geonode/geoserver:2.18.2
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://127.0.0.1:8080/geoserver/rest/workspaces/geonode.html"
@@ -101,7 +101,7 @@ services:
     restart: on-failure
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.17.4
+    image: geonode/geoserver_data:2.18.2
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     command: /bin/true
     volumes:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -82,7 +82,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.17.4
+    image: geonode/geoserver:2.18.2
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://127.0.0.1:8080/geoserver/rest/workspaces/geonode.html"
@@ -101,7 +101,7 @@ services:
     restart: on-failure
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.17.4
+    image: geonode/geoserver_data:2.18.2
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     command: /bin/true
     volumes:

diff --git a/scripts/spcgeonode/geoserver/Dockerfile b/scripts/spcgeonode/geoserver/Dockerfile
@@ -1,7 +1,7 @@
 FROM openjdk:8-jre-alpine
 
-ARG version=2.17.4
-ARG branch=2.17.4
+ARG version=2.18.2
+ARG branch=2.18.2
 ARG plugins=
 
 # Install dependencies
@@ -17,7 +17,7 @@ WORKDIR /
 # TODO : merge into on step
 RUN echo "Download geoserver for geonode" && \
     wget https://downloads.sourceforge.net/project/geoserver/GeoServer/$version/geoserver-$version-bin.zip && \
-    wget https://www.dropbox.com/s/a0m1ugxtso8xtyf/geoserver-$branch.war?dl=1 -O geoserver-$branch.war --no-check-certificate && \
+    wget https://www.dropbox.com/s/xlich7pmneaupqp/geoserver-$branch.war?dl=1 -O geoserver-$branch.war --no-check-certificate && \
     mkdir -p geoserver-$version && \
     unzip geoserver-$version-bin.zip -d geoserver-$version && \
     mv geoserver-$version geoserver && \
@@ -36,7 +36,7 @@ RUN for plugin in $plugins; do \
     done
 
 # Download initial data dir
-RUN wget https://www.dropbox.com/s/sebw3h90mtvnzwe/data-$branch.zip?dl=1 -O data-$branch.zip --no-check-certificate && \
+RUN wget https://www.dropbox.com/s/q0qc2t7d9alo9fk/data-$branch.zip?dl=1 -O data-$branch.zip --no-check-certificate && \
 unzip /data-$branch.zip