Update GeoServer to 2.14.2

GeoNode · Feb 19, 2019 · f066d90 · f066d90
1 parent 19dcacf
commit f066d90
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/scripts/spcgeonode/geoserver/Dockerfile b/scripts/spcgeonode/geoserver/Dockerfile
@@ -1,5 +1,8 @@
 FROM openjdk:8-jre-alpine
 
+ARG version=2.14.2
+ARG branch=2.14.x
+
 # Install dependencies
 RUN apk add --no-cache ca-certificates openssl curl postgresql-client fontconfig ttf-ubuntu-font-family
 RUN update-ca-certificates
@@ -12,20 +15,21 @@ WORKDIR /
 # TODO : this is a bit dirty..... can't we stat from vanilla Geoserver ?
 # TODO : merge into on step
 RUN echo "Download geoserver for geonode" && \
-    wget https://downloads.sourceforge.net/project/geoserver/GeoServer/2.14.0/geoserver-2.14.0-bin.zip && \
-    wget https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-2.14.x.war --no-check-certificate && \
-    unzip geoserver-2.14.0-bin.zip && \
-    rm /geoserver-2.14.0-bin.zip && \
-    rm /geoserver-2.14.0/webapps/geoserver/* -rf && \
-    unzip -o geoserver-2.14.x.war -d /geoserver-2.14.0/webapps/geoserver/ && \
-    rm /geoserver-2.14.x.war
+    wget https://downloads.sourceforge.net/project/geoserver/GeoServer/$version/geoserver-$version-bin.zip && \
+    wget https://build.geo-solutions.it/geonode/geoserver/latest/geoserver-$branch.war --no-check-certificate && \
+    unzip geoserver-$version-bin.zip && \
+    mv geoserver-$version geoserver && \
+    rm /geoserver-$version-bin.zip && \
+    rm /geoserver-$version/webapps/geoserver/* -rf && \
+    unzip -o geoserver-$branch.war -d /geoserver/webapps/geoserver/ && \
+    rm /geoserver-$branch.war
 
 # Download initial data dir
-RUN wget https://build.geo-solutions.it/geonode/geoserver/latest/data-2.14.x.zip --no-check-certificate
-RUN unzip /data-2.14.x.zip
+RUN wget https://build.geo-solutions.it/geonode/geoserver/latest/data-$branch.zip --no-check-certificate
+RUN unzip /data-$branch.zip
 RUN ls /data
 
-WORKDIR /geoserver-2.14.0/
+WORKDIR /geoserver/
 
 # Add the entrypoint
 ADD docker-entrypoint.sh /docker-entrypoint.sh 
@@ -36,7 +40,7 @@ ENTRYPOINT ["/docker-entrypoint.sh"]
 EXPOSE 8080
 
 # Set environnment variables
-ENV GEOSERVER_HOME=/geoserver-2.14.0
+ENV GEOSERVER_HOME=/geoserver
 ENV GEOSERVER_DATA_DIR=/spcgeonode-geodatadir
 
 # Run geoserver

diff --git a/scripts/spcgeonode/geoserver/docker-entrypoint.sh b/scripts/spcgeonode/geoserver/docker-entrypoint.sh
@@ -55,7 +55,7 @@ fi
 echo "-----------------------------------------------------"
 echo "2. (Re)setting admin account"
 
-ADMIN_ENCRYPTED_PASSWORD=$(/usr/lib/jvm/java-1.8-openjdk/jre/bin/java -classpath /geoserver-2.14.0/webapps/geoserver/WEB-INF/lib/jasypt-1.9.2.jar org.jasypt.intf.cli.JasyptStringDigestCLI digest.sh algorithm=SHA-256 saltSizeBytes=16 iterations=100000 input="$ADMIN_PASSWORD" verbose=0 | tr -d '\n')
+ADMIN_ENCRYPTED_PASSWORD=$(/usr/lib/jvm/java-1.8-openjdk/jre/bin/java -classpath /geoserver/webapps/geoserver/WEB-INF/lib/jasypt-1.9.2.jar org.jasypt.intf.cli.JasyptStringDigestCLI digest.sh algorithm=SHA-256 saltSizeBytes=16 iterations=100000 input="$ADMIN_PASSWORD" verbose=0 | tr -d '\n')
 sed -i -r "s|<user enabled=\".*\" name=\".*\" password=\".*\"/>|<user enabled=\"true\" name=\"$ADMIN_USERNAME\" password=\"digest1:$ADMIN_ENCRYPTED_PASSWORD\"/>|" "/spcgeonode-geodatadir/security/usergroup/default/users.xml"
 # TODO : more selective regexp for this one as there may be several users...
 sed -i -r "s|<userRoles username=\".*\">|<userRoles username=\"$ADMIN_USERNAME\">|" "/spcgeonode-geodatadir/security/role/default/roles.xml"