[Fixes #57] Move datadir management to the Geoserver image

docker/geoserver/Dockerfile

@@ -17,17 +17,30 @@ ENV GEOSERVER_CORS_ENABLED=$GEOSERVER_CORS_ENABLED
 ENV GEOSERVER_CORS_ALLOWED_ORIGINS=$GEOSERVER_CORS_ALLOWED_ORIGINS
 ENV GEOSERVER_CORS_ALLOWED_METHODS=$GEOSERVER_CORS_ALLOWED_METHODS
 ENV GEOSERVER_CORS_ALLOWED_HEADERS=$GEOSERVER_CORS_ALLOWED_HEADERS
+
+
+RUN apt-get update -y && apt-get install curl wget unzip -y
+RUN apt-get install -y procps less && \
+    apt-get install -y python3 python3-pip python3-dev
+
+RUN pip install j2cli invoke==2.2.0 requests==2.31.0
+
 #
 # Download and install GeoServer
 #
-RUN apt-get update -y && apt-get install curl wget unzip -y
 RUN cd /usr/local/tomcat/webapps \
     && wget --no-check-certificate --progress=bar:force:noscroll https://artifacts.geonode.org/geoserver/${GEOSERVER_VERSION}/geoserver.war -O geoserver.war \
     && unzip -q geoserver.war -d geoserver \
-    && rm geoserver.war \
-    && mkdir -p $GEOSERVER_DATA_DIR
+    && rm geoserver.war
 
-VOLUME $GEOSERVER_DATA_DIR
+#
+# Download datadir 
+# 
+RUN mkdir -p /tmp/geonode/downloaded
+WORKDIR /tmp/geonode/downloaded
+ENV TEMP_DOWNLOADED /tmp/geonode/downloaded
+RUN wget --no-check-certificate --progress=bar:force:noscroll https://artifacts.geonode.org/geoserver/$GEOSERVER_VERSION/geonode-geoserver-ext-web-app-data.zip -O data.zip \
+    && unzip -x data 
 
 # no longer used since 2.24.2
 #ENV GEOSERVER_LIB_DIR="/usr/local/tomcat/webapps/geoserver/WEB-INF/lib"
@@ -54,11 +67,6 @@ RUN chmod +x \
         /usr/local/tomcat/tmp/set_geoserver_auth.sh \
         /usr/local/tomcat/tmp/entrypoint.sh
 
-RUN apt-get install -y procps less && \
-    apt-get install -y python3 python3-pip python3-dev
-
-RUN pip install j2cli invoke==2.2.0 requests==2.31.0
-
 ENV JAVA_OPTS="-Djava.awt.headless=true -Dgwc.context.suffix=gwc -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:MaxPermSize=512m -XX:PermSize=256m -Xms512m -Xmx2048m -XX:+UseConcMarkSweepGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=false -DGS-SHAPEFILE-CHARSET=UTF-8 -DGEOSERVER_CSRF_DISABLED=true -DPRINT_BASE_URL=http://geoserver:8080/geoserver/pdf -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine"
 
 CMD ["/usr/local/tomcat/tmp/entrypoint.sh"]

docker/geoserver/entrypoint.sh

@@ -15,6 +15,16 @@ invoke () {
     echo "$@ tasks done"
 }
 
+
+mkdir -p $GEOSERVER_DATA_DIR
+if [ -z "$( ls -A ${GEOSERVER_DATA_DIR} )" ];
+then
+    echo "${GEOSERVER_DATA_DIR} is empty. It will be populated with the default datadir content"
+    cp -r ${TEMP_DOWNLOADED}/data/* ${GEOSERVER_DATA_DIR}
+else
+    echo "${GEOSERVER_DATA_DIR} is already populated. It won't be touched"
+fi
+
 # control the values of LB settings if present
 if [ -n "$GEONODE_LB_HOST_IP" ];
 then