Merge pull request #50 from nds-cprm/master

Add some ARGs

Author: giohappy

docker/geoserver/Dockerfile

@@ -3,14 +3,15 @@ ARG JAVA_HOME=/usr/local/openjdk-11
 FROM tomcat:$IMAGE_VERSION
 LABEL GeoNode Development Team
 
+ARG GEOSERVER_VERSION=2.24.5
 ARG GEOSERVER_CORS_ENABLED=False
 ARG GEOSERVER_CORS_ALLOWED_ORIGINS=*
 ARG GEOSERVER_CORS_ALLOWED_METHODS=GET,POST,PUT,DELETE,HEAD,OPTIONS
 ARG GEOSERVER_CORS_ALLOWED_HEADERS=*
 #
 # Set GeoServer version and data directory
 #
-ENV GEOSERVER_VERSION=2.24.5
+ENV GEOSERVER_VERSION=${GEOSERVER_VERSION}
 ENV GEOSERVER_DATA_DIR="/geoserver_data/data"
 ENV GEOSERVER_CORS_ENABLED=$GEOSERVER_CORS_ENABLED
 ENV GEOSERVER_CORS_ALLOWED_ORIGINS=$GEOSERVER_CORS_ALLOWED_ORIGINS
@@ -45,7 +46,7 @@ COPY set_geoserver_auth.sh \
      tasks.py \
      multidump.sh \
      multidump-alt.sh \
-     /usr/local/tomcat/tmp
+     /usr/local/tomcat/tmp/
 
 COPY ./templates /templates
 

docker/geoserver_data/Dockerfile

@@ -1,4 +1,5 @@
 FROM alpine:latest
+ARG GEOSERVER_VERSION=2.24.5
 LABEL GeoNode development team
 
 # Install curl in alpine 3.3+
@@ -9,7 +10,7 @@ RUN mkdir -p /tmp/geonode/downloaded
 ENV TEMP_DOWNLOADED /tmp/geonode/downloaded
 WORKDIR ${TEMP_DOWNLOADED}
 
-ENV GEOSERVER_VERSION=2.24.5
+ENV GEOSERVER_VERSION=${GEOSERVER_VERSION}
 
 ADD download.sh ${TEMP_DOWNLOADED}
 RUN chmod +x ${TEMP_DOWNLOADED}/download.sh

docker/nginx/Dockerfile

@@ -1,4 +1,5 @@
-FROM nginx:1.25.3-alpine
+ARG NGINX_VERSION=1.25.3
+FROM nginx:${NGINX_VERSION}-alpine
 
 RUN apk add --no-cache openssl inotify-tools vim
 

docker/postgis/Dockerfile

@@ -1,4 +1,6 @@
-FROM postgis/postgis:15-3.3-alpine
+ARG POSTGRES_VERSION=15
+ARG POSTGIS_VERSION=3.3
+FROM postgis/postgis:${POSTGRES_VERSION}-${POSTGIS_VERSION}-alpine
 LABEL GeoNode development team
 
 COPY ./initdb-geonode.sh /docker-entrypoint-initdb.d/geonode.sh