[Fixes #4653] Use GeoServer 2.15.2

GeoNode · Jul 17, 2019 · 04a5235 · 04a5235
1 parent af27fa5
commit 04a5235
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/dev_config.yml b/dev_config.yml
@@ -1,6 +1,6 @@
 ---
-GEOSERVER_URL: "https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-2.14.3.war"
-DATA_DIR_URL: "https://build.geo-solutions.it/geonode/geoserver/latest/data-2.14.3.zip"
+GEOSERVER_URL: "https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-2.15.2.war"
+DATA_DIR_URL: "https://build.geo-solutions.it/geonode/geoserver/latest/data-2.15.2.zip"
 JETTY_RUNNER_URL: "http://repo2.maven.org/maven2/org/eclipse/jetty/jetty-runner/9.4.7.v20170914/jetty-runner-9.4.7.v20170914.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.14.3
+    image: geonode/geoserver_data:2.15.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.14.3
+    image: geonode/geoserver:2.15.2
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true

diff --git a/docker-compose.async.yml b/docker-compose.async.yml
@@ -59,7 +59,7 @@ services:
       - ./scripts/docker/env/${SET_DOCKER_ENV}/celery.env
 
   geoserver:
-    image: geonode/geoserver:2.14.3
+    image: geonode/geoserver:2.15.2
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true
@@ -118,7 +118,7 @@ services:
       - statics:/mnt/volumes/statics
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.14.3
+    image: geonode/geoserver_data:2.15.2
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - ./scripts/docker/env/${SET_DOCKER_ENV}/db.env
 
   geoserver:
-    image: geonode/geoserver:2.14.3
+    image: geonode/geoserver:2.15.2
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true
@@ -71,7 +71,7 @@ services:
       - statics:/mnt/volumes/statics
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.14.3
+    image: geonode/geoserver_data:2.15.2
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:

diff --git a/docs/install/core/index.rst b/docs/install/core/index.rst
@@ -379,8 +379,8 @@ Let's externalize the ``GEOSERVER_DATA_DIR`` and ``logs``
   sudo chmod -Rf 775 /opt/data/logs
 
   # Download and extract the default GEOSERVER_DATA_DIR
-  sudo wget --no-check-certificate https://build.geo-solutions.it/geonode/geoserver/latest/data-2.14.3.zip
-  sudo unzip data-2.14.3.zip -d /opt/data/
+  sudo wget --no-check-certificate https://build.geo-solutions.it/geonode/geoserver/latest/data-2.15.2.zip
+  sudo unzip data-2.15.2.zip -d /opt/data/
 
   sudo mv /opt/data/data/ /opt/data/geoserver_data
   sudo chown -Rf tomcat:www-data /opt/data/geoserver_data
@@ -395,8 +395,8 @@ Let's externalize the ``GEOSERVER_DATA_DIR`` and ``logs``
   sudo chmod -Rf 775 /opt/data/gwc_cache_dir
 
   # Download and install GeoServer
-  sudo wget --no-check-certificate https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-2.14.3.war
-  sudo mv geoserver-2.14.3.war /usr/local/apache-tomcat8/webapps/geoserver.war
+  sudo wget --no-check-certificate https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-2.15.2.war
+  sudo mv geoserver-2.15.2.war /usr/local/apache-tomcat8/webapps/geoserver.war
 
 Let's now configure the ``JAVA_OPTS``, i.e. the parameters to run the Servlet Container, like heap memory, garbage collector and so on.
 
@@ -1248,10 +1248,10 @@ Update the GeoServer instance inside the GeoServer Container
 .. code-block:: shell
 
   cd /usr/local/tomcat/
-  wget --no-check-certificate https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-2.14.3.war
+  wget --no-check-certificate https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-.2.15.2.war
   mkdir tmp/geoserver
   cd tmp/geoserver/
-  unzip /usr/local/tomcat/geoserver-2.14.3.war
+  unzip /usr/local/tomcat/geoserver-2.15.2.war
   rm -Rf data
   cp -Rf /usr/local/tomcat/webapps/geoserver/data/ .
   cd /usr/local/tomcat/
@@ -1296,7 +1296,7 @@ It is possible to let docker show which containers are currently running (add ``
   CONTAINER ID        IMAGE                      COMMAND                  CREATED             STATUS              PORTS                NAMES
   3b232931f820        geonode/nginx:production    "nginx -g 'daemon of…"   26 minutes ago      Up 26 minutes       0.0.0.0:80->80/tcp   nginx4geonode
   ff7002ae6e91        geonode/geonode:latest     "/usr/src/app/entryp…"   26 minutes ago      Up 26 minutes       8000/tcp             django4geonode
-  2f155e5043be        geonode/geoserver:2.14.3   "/usr/local/tomcat/t…"   26 minutes ago      Up 26 minutes       8080/tcp             geoserver4geonode
+  2f155e5043be        geonode/geoserver:2.15.2   "/usr/local/tomcat/t…"   26 minutes ago      Up 26 minutes       8080/tcp             geoserver4geonode
   97f1668a01b1        geonode_celery             "/usr/src/app/entryp…"   26 minutes ago      Up 26 minutes       8000/tcp             geonode_celery_1
   1b623598b1bd        geonode/postgis:10         "docker-entrypoint.s…"   About an hour ago   Up 26 minutes       5432/tcp             db4geonode
 

diff --git a/docs/install/project/index.rst b/docs/install/project/index.rst
@@ -476,7 +476,7 @@ with following content
         branch_name: master
         virtualenv_dir: /home/geo/.venvs
         site_url: http://mygeonode.org/
-        geoserver_url: https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-2.14.3.war
+        geoserver_url: https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-2.15.2.war
         pg_max_connections: 100
         pg_shared_buffers: 128MB
         tomcat_xms: 1024M

diff --git a/scripts/spcgeonode/geoserver/Dockerfile b/scripts/spcgeonode/geoserver/Dockerfile
@@ -1,7 +1,7 @@
 FROM openjdk:8-jre-alpine
 
-ARG version=2.14.3
-ARG branch=2.14.3
+ARG version=2.15.2
+ARG branch=2.15.2
 ARG plugins=
 
 # Install dependencies