- Fix env and docker-compose variables accordingly to the updated ge…

…oserver docker image requirements (#9113)

.env

@@ -1,4 +1,5 @@
 COMPOSE_PROJECT_NAME=geonode
+DOCKERHOST=
 DOCKER_HOST_IP=
 DOCKER_ENV=production
 # See https://github.com/geosolutions-it/geonode-generic/issues/28
@@ -17,6 +18,8 @@ DJANGO_SETTINGS_MODULE=geonode.settings
 GEONODE_INSTANCE_NAME=geonode
 GEONODE_LB_HOST_IP=
 GEONODE_LB_PORT=
+PUBLIC_PORT=80
+NGINX_BASE_URL=
 
 # #################
 # backend
@@ -198,6 +201,14 @@ EXIF_ENABLED=True
 CREATE_LAYER=True
 FAVORITE_ENABLED=True
 
+# Advanced Workflow
+RESOURCE_PUBLISHING=False
+ADMIN_MODERATE_UPLOADS=False
+
+# Upload Size Limiting
+DEFAULT_MAX_UPLOAD_SIZE=5368709120
+DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=100
+
 # LDAP
 LDAP_ENABLED=False
 LDAP_SERVER_URL=ldap://<the_ldap_server>

.env_dev

@@ -1,4 +1,5 @@
 COMPOSE_PROJECT_NAME=geonode
+DOCKERHOST=
 DOCKER_HOST_IP=
 DOCKER_ENV=production
 # See https://github.com/geosolutions-it/geonode-generic/issues/28
@@ -17,6 +18,8 @@ DJANGO_SETTINGS_MODULE=geonode.settings
 GEONODE_INSTANCE_NAME=geonode
 GEONODE_LB_HOST_IP=
 GEONODE_LB_PORT=
+PUBLIC_PORT=80
+NGINX_BASE_URL=
 
 # #################
 # backend
@@ -195,3 +198,7 @@ FAVORITE_ENABLED=True
 # Advanced Workflow
 RESOURCE_PUBLISHING=False
 ADMIN_MODERATE_UPLOADS=False
+
+# Upload Size Limiting
+DEFAULT_MAX_UPLOAD_SIZE=5368709120
+DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=100

.env_local

@@ -1,4 +1,5 @@
 COMPOSE_PROJECT_NAME=geonode
+DOCKERHOST=
 DOCKER_HOST_IP=
 DOCKER_ENV=production
 # See https://github.com/geosolutions-it/geonode-generic/issues/28
@@ -17,6 +18,8 @@ DJANGO_SETTINGS_MODULE=geonode.settings
 GEONODE_INSTANCE_NAME=geonode
 GEONODE_LB_HOST_IP=
 GEONODE_LB_PORT=
+PUBLIC_PORT=80
+NGINX_BASE_URL=
 
 # #################
 # backend
@@ -190,4 +193,12 @@ MODIFY_TOPICCATEGORY=True
 AVATAR_GRAVATAR_SSL=True
 EXIF_ENABLED=True
 CREATE_LAYER=True
-FAVORITE_ENABLED=True
+FAVORITE_ENABLED=True
+
+# Advanced Workflow
+RESOURCE_PUBLISHING=False
+ADMIN_MODERATE_UPLOADS=False
+
+# Upload Size Limiting
+DEFAULT_MAX_UPLOAD_SIZE=5368709120
+DEFAULT_MAX_PARALLEL_UPLOADS_PER_USER=100

.env_test

@@ -1,4 +1,5 @@
 COMPOSE_PROJECT_NAME=geonode
+DOCKERHOST=
 DOCKER_HOST_IP=
 DOCKER_ENV=production
 # See https://github.com/geosolutions-it/geonode-generic/issues/28
@@ -17,6 +18,8 @@ DJANGO_SETTINGS_MODULE=geonode.settings
 GEONODE_INSTANCE_NAME=geonode
 GEONODE_LB_HOST_IP=
 GEONODE_LB_PORT=
+PUBLIC_PORT=80
+NGINX_BASE_URL=
 
 # #################
 # backend

.gitignore

@@ -23,10 +23,7 @@ docs/i18n/pot/
 *.jshintrc
 geonode/static/.components/
 geonode/static_root/
-geonode/static/node_modules/
-node_modules/
-# Exception for monitoring frontend
-!geonode/monitoring/static/monitoring/node_modules/
+node_modules
 # Listing all of them instead of putting geonode/static/lib out of version control.
 geonode/local_settings.py
 
@@ -73,9 +70,6 @@ geonode/pip-selfcheck.json
 geonode/shapely/
 geonode/share/
 
-# Contrib monitoring module
-geonode/contrib/monitoring/frontend/node_modules
-geonode/contrib/monitoring/frontend/static
 # celery files
 celerybeat-schedule.*
 
@@ -100,3 +94,4 @@ scripts/spcgeonode/_volume_*
 
 # Docker Hub hooks
 !hooks/*
+

docker-compose-geoserver-server.yml

@@ -26,7 +26,7 @@ services:
     volumes:
       - geoserver-data-dir:/geoserver_data/data
     env_file:
-      - ./scripts/docker/env/${DOCKER_ENV}/geoserver.env
+      - .env
     ports:
       - "${GEOSERVER_SERVER_PORT}:8080"
     network_mode: "bridge"

docker-compose-test.yml

@@ -93,7 +93,7 @@ services:
       retries: 1
       start_period: 60s
     env_file:
-      - ./scripts/docker/env/${DOCKER_ENV}/geoserver.env
+      - .env_test
     volumes:
       - statics:/mnt/volumes/statics
       - geoserver-data-dir:/geoserver_data/data
@@ -116,7 +116,7 @@ services:
     image: geonode/postgis:13
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:
-      - ./scripts/docker/env/${DOCKER_ENV}/db.env
+      - .env_test
     volumes:
       - dbdata:/var/lib/postgresql/data
       - dbbackups:/pg_backups

docker-compose.yml

@@ -93,7 +93,7 @@ services:
       retries: 1
       start_period: 60s
     env_file:
-      - ./scripts/docker/env/${DOCKER_ENV}/geoserver.env
+      - .env
     volumes:
       - statics:/mnt/volumes/statics
       - geoserver-data-dir:/geoserver_data/data
@@ -116,7 +116,7 @@ services:
     image: geonode/postgis:13
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:
-      - ./scripts/docker/env/${DOCKER_ENV}/db.env
+      - .env
     volumes:
       - dbdata:/var/lib/postgresql/data
       - dbbackups:/pg_backups