Merge branch 'master' into dependabot/pip/docker-7.0.0

docker-compose-dev.yml

@@ -52,8 +52,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   geonode:
-    image: geonode/nginx:1.25.1
-    build: ./scripts/docker/nginx/
+    image: geonode/nginx:1.25.3-latest
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env
@@ -70,8 +69,7 @@ services:
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    image: geonode/letsencrypt:latest
-    build: ./scripts/docker/letsencrypt/
+    image: geonode/letsencrypt:2.6.0-latest
     container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env
@@ -81,7 +79,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.23.0
+    image: geonode/geoserver:2.23.3-latest
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -107,7 +105,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.23.0
+    image: geonode/geoserver_data:2.23.3-latest
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:
@@ -119,7 +117,7 @@ services:
   # PostGIS database.
   db:
     # use geonode official postgis 15 image
-    image: geonode/postgis:15
+    image: geonode/postgis:15.3-latest
     command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:

docker-compose-geoserver-server.yml

@@ -2,7 +2,7 @@ version: '2.2'
 services:
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.23.0
+    image: geonode/geoserver_data:latest
     restart: on-failure
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     labels:
@@ -13,7 +13,7 @@ services:
       - geoserver-data-dir:/geoserver_data/data
 
   geoserver:
-    image: geonode/geoserver:2.23.0
+    image: geonode/geoserver:latest
     restart: unless-stopped
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     stdin_open: true

docker-compose-test.yml

@@ -52,8 +52,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   geonode:
-    image: geonode/nginx:1.25.1
-    build: ./scripts/docker/nginx/
+    image: geonode/nginx:1.25.3-latest
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env_test
@@ -83,8 +82,7 @@ services:
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    image: geonode/letsencrypt:latest
-    build: ./scripts/docker/letsencrypt/
+    image: geonode/letsencrypt:2.6.0-latest
     container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env_test
@@ -94,7 +92,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.23.0
+    image: geonode/geoserver:2.23.3-latest
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -120,7 +118,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.23.0
+    image: geonode/geoserver_data:2.23.3-latest
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:
@@ -132,7 +130,7 @@ services:
   # PostGIS database.
   db:
     # use geonode official postgis 15 image
-    image: geonode/postgis:15
+    image: geonode/postgis:15.3-latest
     command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:

docker-compose.yml

@@ -61,8 +61,7 @@ services:
 
   # Nginx is serving django static and media files and proxies to django and geonode
   geonode:
-    image: geonode/nginx:1.25.1
-    build: ./scripts/docker/nginx/
+    image: geonode/nginx:1.25.3-latest
     container_name: nginx4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env
@@ -79,8 +78,7 @@ services:
 
   # Gets and installs letsencrypt certificates
   letsencrypt:
-    image: geonode/letsencrypt:latest
-    build: ./scripts/docker/letsencrypt/
+    image: geonode/letsencrypt:2.6.0-latest
     container_name: letsencrypt4${COMPOSE_PROJECT_NAME}
     env_file:
       - .env
@@ -90,7 +88,7 @@ services:
 
   # Geoserver backend
   geoserver:
-    image: geonode/geoserver:2.23.0
+    image: geonode/geoserver:2.23.3-latest
     container_name: geoserver4${COMPOSE_PROJECT_NAME}
     healthcheck:
       test: "curl -m 10 --fail --silent --write-out 'HTTP CODE : %{http_code}\n' --output /dev/null http://geoserver:8080/geoserver/ows"
@@ -116,7 +114,7 @@ services:
         condition: service_healthy
 
   data-dir-conf:
-    image: geonode/geoserver_data:2.23.0
+    image: geonode/geoserver_data:2.23.3-latest
     container_name: gsconf4${COMPOSE_PROJECT_NAME}
     entrypoint: sleep infinity
     volumes:
@@ -128,7 +126,7 @@ services:
   # PostGIS database.
   db:
     # use geonode official postgis 15 image
-    image: geonode/postgis:15
+    image: geonode/postgis:15.3-latest
     command: postgres -c "max_connections=${POSTGRESQL_MAX_CONNECTIONS}"
     container_name: db4${COMPOSE_PROJECT_NAME}
     env_file:

requirements.txt

@@ -1,6 +1,6 @@
 # native dependencies
-Pillow==10.0.1
-lxml==4.9.3
+Pillow==10.2.0
+lxml==5.1.0
 psycopg2==2.9.9
 Django==3.2.23
 
@@ -9,30 +9,30 @@ amqp==5.2.0
 beautifulsoup4==4.12.2
 httplib2<0.22.1
 hyperlink==21.0.0
-idna>=2.5,<3.5
+idna>=2.5,<3.7
 urllib3==1.26.18
 Paver==1.3.4
 python-slugify==8.0.1
 decorator==5.1.1
-celery==5.3.5
-kombu==5.3.3
+celery==5.3.6
+kombu==5.3.4
 vine==5.1.0
 tqdm==4.66.1
 Deprecated==1.2.14
-wrapt==1.15.0
-jsonschema==4.19.2
+wrapt==1.16.0
+jsonschema==4.20.0
 zipstream-new==1.1.8
 schema==0.7.5
 rdflib==6.3.2
 smart_open==6.4.0
-PyMuPDF==1.23.4
+PyMuPDF==1.23.8
 pathvalidate==3.2.0
 
 # Django Apps
 django-allauth==0.54.0
-django-appconf==1.0.5
+django-appconf==1.0.6
 django-celery-results==2.5.1
-django-filter==23.3
+django-filter==23.5
 django-imagekit==4.1.0
 django-taggit==1.5.1
 django-markdownify==0.9.3
@@ -47,19 +47,18 @@ django-tinymce==3.6.1
 django-grappelli==3.0.8
 django-uuid-upload-path==1.0.0
 django-widget-tweaks==1.5.0
-django-sequences==2.8
+django-sequences==2.9
 oauthlib==3.2.2
-pyopenssl==23.2.0
+pyopenssl==23.3.0
 pyjwt==2.8.0
 
 # geopython dependencies
 pyproj<3.7.0
 OWSLib==0.29.3
 pycsw==2.6.1
-SQLAlchemy==2.0.21 # required by PyCSW
+SQLAlchemy==2.0.22 # required by PyCSW
 Shapely==1.8.5.post1
 mercantile==1.2.1
-geoip2==4.7.0
 numpy==1.26.*
 
 # # Apps with packages provided in GeoNode's PPA on Launchpad.
@@ -71,7 +70,7 @@ django-select2==8.1.2
 django-floppyforms<1.10.0
 django-forms-bootstrap<=3.1.0
 django-autocomplete-light==3.5.1
-django-invitations<2.0.1
+django-invitations<2.1.1
 django-recaptcha==3.0.0
 
 # REST
@@ -80,9 +79,9 @@ djangorestframework-gis==1.0
 djangorestframework-guardian==0.3.0
 drf-extensions==0.7.1
 drf-writable-nested==0.7.0
-drf-spectacular==0.26.5
+drf-spectacular==0.27.0
 dynamic-rest==2.1.2
-Markdown==3.5
+Markdown==3.5.1
 
 pinax-notifications==6.0.0
 pinax-ratings==4.0.0
@@ -91,7 +90,7 @@ pinax-ratings==4.0.0
 # django-geonode-mapstore-client==4.0.5
 -e git+https://github.com/GeoNode/geonode-mapstore-client.git@master#egg=django_geonode_mapstore_client
 -e git+https://github.com/GeoNode/geonode-importer.git@master#egg=geonode-importer
-django-avatar==7.1.1
+django-avatar==8.0.0
 geonode-oauth-toolkit==2.2.2
 geonode-user-messages==2.0.2
 geonode-announcements==2.0.2
@@ -109,15 +108,15 @@ elasticsearch>=2.0.0,<9.0.0
 django-bootstrap3-datetimepicker-2==2.8.3
 
 # storage manager dependencies
-django-storages==1.14.1
+django-storages==1.14.2
 dropbox==11.36.2
-google-cloud-storage==2.11.0
-google-cloud-core==2.3.3
-boto3==1.28.56
+google-cloud-storage==2.14.0
+google-cloud-core==2.4.1
+boto3==1.34.15
 
 # Django Caches
-python-memcached<=1.59
-whitenoise==6.5.0
+python-memcached<=1.61
+whitenoise==6.6.0
 Brotli==1.1.0
 
 # Contribs
@@ -133,33 +132,33 @@ pylibmc==1.6.3
 sherlock==0.4.1
 
 # required by monitoring
-psutil==5.9.5
-django-cors-headers==4.2.0
+psutil==5.9.7
+django-cors-headers==4.3.1
 user-agents
 django-user-agents
 xmljson
-django-ipware<5.1
+django-ipware<6.1
 # no version here, use latest one with fresh data
 pycountry
 
 # production
-uWSGI==2.0.22
+uWSGI==2.0.23
 gunicorn==21.2.0
-ipython==8.16.1
+ipython==8.20.0
 docker==7.0.0
 invoke==2.2.0
 
 # tests
 coverage==7.4.0
 requests-toolbelt==1.0.0
-flake8==6.1.0
+flake8==7.0.0
 black==23.12.1
-pytest==7.4.2
-pytest-bdd==6.1.1
-splinter==0.19.0
+pytest==7.4.4
+pytest-bdd==7.0.1
+splinter==0.20.1
 pytest-splinter==3.3.2
-pytest-django==4.5.2
-setuptools>=65.5.1,<68.3.0
+pytest-django==4.7.0
+setuptools>=65.5.1,<69.1.0
 pip==23.3.1
 Twisted==23.10.0
 pixelmatch==0.3.0
@@ -172,7 +171,7 @@ webdriver_manager==4.0.1
 # Security and audit
 mistune==3.0.2
 protobuf==3.20.3
-mako==1.2.4
+mako==1.3.0
 paramiko==3.4.0 # not directly required, fixes Blowfish deprecation warning
 certifi>=2023.7.22 # not directly required, pinned by Snyk to avoid a vulnerability
 jwcrypto>=1.4 # not directly required, pinned by Snyk to avoid a vulnerability