- Updating docker-compose tags, images versions and .envs� - Bump Po…

…stgres Image from 13 to 15
GeoNode · afabiani · Jul 27, 2023 · Jun 26, 2023 · Jun 26, 2023 · Jun 26, 2023
commit 98d0ef3adf78875490b4f34866a15f9303ebbefc
diff --git a/.env b/.env
@@ -29,8 +29,10 @@ NGINX_BASE_URL=
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 GEONODE_DATABASE=geonode
+GEONODE_DATABASE_USER=geonode
 GEONODE_DATABASE_PASSWORD=geonode
 GEONODE_GEODATABASE=geonode_data
+GEONODE_GEODATABASE_USER=geonode_data
 GEONODE_GEODATABASE_PASSWORD=geonode_data
 GEONODE_DATABASE_SCHEMA=public
 GEONODE_GEODATABASE_SCHEMA=public
@@ -45,7 +47,7 @@ BROKER_URL=amqp://guest:guest@rabbitmq:5672/
 CELERY_BEAT_SCHEDULER=celery.beat:PersistentScheduler
 ASYNC_SIGNALS=True
 
-SITEURL=http://localhost/
+SITEURL=https://localhost/
 
 ALLOWED_HOSTS=['django', '*']
 
@@ -67,8 +69,8 @@ GEONODE_LB_PORT=80
 
 # IP or domain name and port where the server can be reached on HTTPS (leave HOST empty if you want to use HTTP only)
 # port where the server can be reached on HTTPS
-HTTP_HOST=localhost
-HTTPS_HOST=
+HTTP_HOST=
+HTTPS_HOST=localhost
 
 HTTP_PORT=80
 HTTPS_PORT=443
@@ -78,17 +80,17 @@ HTTPS_PORT=443
 # disabled : we do not get a certificate at all (a placeholder certificate will be used)
 # staging : we get staging certificates (are invalid, but allow to test the process completely and have much higher limit rates)
 # production : we get a normal certificate (default)
-LETSENCRYPT_MODE=disabled
-# LETSENCRYPT_MODE=staging
+# LETSENCRYPT_MODE=disabled
+LETSENCRYPT_MODE=staging
 # LETSENCRYPT_MODE=production
 
 RESOLVER=127.0.0.11
 
 # #################
 # geoserver
 # #################
-GEOSERVER_WEB_UI_LOCATION=http://localhost/geoserver/
-GEOSERVER_PUBLIC_LOCATION=http://localhost/geoserver/
+GEOSERVER_WEB_UI_LOCATION=https://localhost/geoserver/
+GEOSERVER_PUBLIC_LOCATION=https://localhost/geoserver/
 GEOSERVER_LOCATION=http://geoserver:8080/geoserver/
 GEOSERVER_ADMIN_USER=admin
 GEOSERVER_ADMIN_PASSWORD=geoserver
@@ -186,7 +188,7 @@ BING_API_KEY=
 GOOGLE_API_KEY=
 
 # Monitoring
-MONITORING_ENABLED=True
+MONITORING_ENABLED=False
 MONITORING_DATA_TTL=365
 USER_ANALYTICS_ENABLED=True
 USER_ANALYTICS_GZIP=True

diff --git a/.env_dev b/.env_dev
@@ -29,8 +29,10 @@ NGINX_BASE_URL=
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 GEONODE_DATABASE=geonode
+GEONODE_DATABASE_USER=geonode
 GEONODE_DATABASE_PASSWORD=geonode
 GEONODE_GEODATABASE=geonode_data
+GEONODE_GEODATABASE_USER=geonode
 GEONODE_GEODATABASE_PASSWORD=geonode
 GEONODE_DATABASE_SCHEMA=public
 GEONODE_GEODATABASE_SCHEMA=public

diff --git a/.env_local b/.env_local
@@ -29,8 +29,10 @@ NGINX_BASE_URL=
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 GEONODE_DATABASE=geonode
+GEONODE_DATABASE_USER=geonode
 GEONODE_DATABASE_PASSWORD=geonode
 GEONODE_GEODATABASE=geonode_data
+GEONODE_GEODATABASE_USER=geonode
 GEONODE_GEODATABASE_PASSWORD=geonode
 GEONODE_DATABASE_SCHEMA=public
 GEONODE_GEODATABASE_SCHEMA=public
@@ -45,7 +47,7 @@ BROKER_URL=amqp://admin:admin@localhost:5672//
 CELERY_BEAT_SCHEDULER=celery.beat:PersistentScheduler
 ASYNC_SIGNALS=False
 
-SITEURL=http://localhost/
+SITEURL=http://localhost:8000/
 
 ALLOWED_HOSTS="['django', '*']"
 

diff --git a/.env_test b/.env_test
@@ -29,9 +29,11 @@ NGINX_BASE_URL=
 POSTGRES_USER=postgres
 POSTGRES_PASSWORD=postgres
 GEONODE_DATABASE=geonode
+GEONODE_DATABASE_USER=geonode
 GEONODE_DATABASE_PASSWORD=geonode
 GEONODE_GEODATABASE=geonode_data
-GEONODE_GEODATABASE_PASSWORD=geonode_data
+GEONODE_GEODATABASE_USER=geonode
+GEONODE_GEODATABASE_PASSWORD=geonode
 GEONODE_DATABASE_SCHEMA=public
 GEONODE_GEODATABASE_SCHEMA=public
 DATABASE_HOST=db
@@ -192,7 +194,7 @@ BING_API_KEY=
 GOOGLE_API_KEY=
 
 # Monitoring
-MONITORING_ENABLED=True
+MONITORING_ENABLED=False
 MONITORING_DATA_TTL=365
 USER_ANALYTICS_ENABLED=True
 USER_ANALYTICS_GZIP=True

diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ RUN apt-get install -y \
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends \
     gcc zip gettext geoip-bin cron \
-    postgresql-client-13 \
+    postgresql-client-15 \
     python3-all-dev python3-dev \
     python3-gdal python3-psycopg2 python3-ldap \
     python3-pip python3-pil python3-lxml \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,8 +3,8 @@ version: '3.9'
 # Common Django template for GeoNode and Celery services below
 x-common-django:
   &default-common-django
-  image: geonode/geonode:4.0
-  restart: on-failure
+  image: geonode/geonode:4.1.0
+  restart: unless-stopped
   env_file:
     - .env
   volumes:
@@ -43,7 +43,7 @@ services:
   # Celery worker that executes celery tasks created by Django.
   celery:
     << : *default-common-django
-    image: geonode/geonode:4.0
+    image: geonode/geonode:4.1.0
     container_name: celery4${COMPOSE_PROJECT_NAME}
     depends_on:
       - django
@@ -54,7 +54,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   geonode:
-    image: geonode/nginx:4.0
+    image: geonode/nginx:4.1.0
     build: ./scripts/docker/nginx/
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     environment:
@@ -71,11 +71,11 @@ services:
       - nginx-confd:/etc/nginx
       - nginx-certificates:/geonode-certificates
       - statics:/mnt/volumes/statics
-    restart: on-failure
+    restart: unless-stopped
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    image: geonode/letsencrypt:4.0
+    image: geonode/letsencrypt:4.1.0
     build: ./scripts/docker/letsencrypt/
     container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
     environment:
@@ -85,7 +85,7 @@ services:
       - LETSENCRYPT_MODE=${LETSENCRYPT_MODE}
     volumes:
       - nginx-certificates:/geonode-certificates
-    restart: on-failure
+    restart: unless-stopped
 
   # Geoserver backend
   geoserver:
@@ -105,7 +105,7 @@ services:
       - backup-restore:/backup_restore
       - data:/data
       - tmp:/tmp
-    restart: on-failure
+    restart: unless-stopped
     depends_on:
       db:
         condition: service_healthy
@@ -118,22 +118,22 @@ services:
     entrypoint: sleep infinity
     volumes:
       - geoserver-data-dir:/geoserver_data/data
-    restart: on-failure
+    restart: unless-stopped
     healthcheck:
       test: "ls -A '/geoserver_data/data' | wc -l"
 
   # PostGIS database.
   db:
-    # use geonode official postgis 13 image
-    image: geonode/postgis:13
+    # use geonode official postgis 15 image
+    image: geonode/postgis:15
     command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env
     volumes:
       - dbdata:/var/lib/postgresql/data
       - dbbackups:/pg_backups
-    restart: on-failure
+    restart: unless-stopped
     healthcheck:
       test: "pg_isready -d postgres -U postgres"
     # uncomment to enable remote connections to postgres
@@ -142,11 +142,11 @@ services:
 
   # Vanilla RabbitMQ service. This is needed by celery
   rabbitmq:
-    image: rabbitmq:3.7-alpine
+    image: rabbitmq:alpine
     container_name: rabbitmq4${COMPOSE_PROJECT_NAME}
     volumes:
       - rabbitmq:/var/lib/rabbitmq
-    restart: on-failure
+    restart: unless-stopped
 
 volumes:
   statics:

diff --git a/scripts/docker/letsencrypt/Dockerfile b/scripts/docker/letsencrypt/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.16
+FROM alpine:3.18
 
 RUN apk add --no-cache certbot 
 

diff --git a/scripts/docker/nginx/Dockerfile b/scripts/docker/nginx/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1-alpine
+FROM nginx:alpine
 
 RUN apk add --no-cache openssl inotify-tools
 

diff --git a/start_django_async.sh b/start_django_async.sh
@@ -4,7 +4,7 @@ set -e
 export RESOURCE_PUBLISHING=True
 export ADMIN_MODERATE_UPLOADS=True
 export NOTIFICATION_ENABLED=True
-export MONITORING_ENABLED=True
+export MONITORING_ENABLED=False
 export EMAIL_ENABLED=True
 export BROKER_URL=amqp://guest:guest@localhost:5672/
 export ASYNC_SIGNALS=True