From 32176559a808d46bf962e969d7d6577969e4bfaf Mon Sep 17 00:00:00 2001 From: Erik Wasmosy Date: Mon, 8 Jan 2024 06:25:31 -0300 Subject: [PATCH 1/3] Update README.md - Fixing commands (#504) This pull request introduces a minor modification to the README file, specifically in the template ZIP URL for download. The current README suggests using GN_VERSION as the master branch for download. However, based on GitHub's documentation regarding source code archives (GitHub Docs), it is recommended to use 'heads' instead of 'tags' when downloading from a branch. Changes Made: Updated the template ZIP URL to use 'heads' instead of 'tags' when specifying the branch for download. References: GitHub Docs - Downloading Source Code Archives ( https://docs.github.com/en/repositories/working-with-files/using-files/downloading-source-code-archives) This change ensures that users who want to download from the branch will have the correct URL format. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 967338fc..f5790f95 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ GeoNode template project. Generates a django project with GeoNode support. ```bash GN_VERSION=master - django-admin startproject --template=https://github.com/GeoNode/geonode-project/archive/refs/tags/$GN_VERSION.zip -e py,sh,md,rst,json,yml,ini,env,sample,properties -n monitoring-cron -n Dockerfile project_name ~/project_name + django-admin startproject --template=https://github.com/GeoNode/geonode-project/archive/refs/heads/$GN_VERSION.zip -e py,sh,md,rst,json,yml,ini,env,sample,properties -n monitoring-cron -n Dockerfile project_name ~/project_name ``` ```bash From 79f3ee2b4faa9579bb13fae07c096a7778adc9ca Mon Sep 17 00:00:00 2001 From: Giovanni Allegri Date: Tue, 9 Jan 2024 10:02:59 +0100 Subject: [PATCH 2/3] Tag docker images (#505) --- docker-compose.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 0b9c2991..88802511 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: '3.9' # Common Django template for GeoNode and Celery services below x-common-django: &default-common-django - image: ${COMPOSE_PROJECT_NAME}_django:latest + image: ${COMPOSE_PROJECT_NAME}/geonode:${GEONODE_BASE_IMAGE_VERSION} restart: unless-stopped env_file: - .env @@ -53,6 +53,7 @@ services: # Nginx is serving django static and media files and proxies to django and geonode geonode: + image: ${COMPOSE_PROJECT_NAME}/nginx:${NGINX_BASE_IMAGE_VERSION} build: context: ./docker/nginx dockerfile: Dockerfile @@ -87,6 +88,7 @@ services: # Gets and installs letsencrypt certificates letsencrypt: + image: ${COMPOSE_PROJECT_NAME}/letsencrypt:${LETSENCRYPT_BASE_IMAGE_VERSION} build: context: ./docker/letsencrypt dockerfile: Dockerfile @@ -101,6 +103,7 @@ services: # Geoserver backend geoserver: + image: ${COMPOSE_PROJECT_NAME}/geoserver:${GEOSERVER_BASE_IMAGE_VERSION} build: context: ./docker/geoserver dockerfile: Dockerfile @@ -131,6 +134,7 @@ services: condition: service_healthy data-dir-conf: + image: ${COMPOSE_PROJECT_NAME}/geoserver_data:${GEOSERVER_DATA_BASE_IMAGE_VERSION} build: context: ./docker/geoserver_data dockerfile: Dockerfile @@ -146,7 +150,7 @@ services: # PostGIS database. db: - # use geonode official postgis 15 image + image: ${COMPOSE_PROJECT_NAME}/postgis:${POSTGRES_BASE_IMAGE_VERSION} build: context: ./docker/postgresql dockerfile: Dockerfile From 7e919d662b63e9938205298f5b7ab3adb6602113 Mon Sep 17 00:00:00 2001 From: Francesco Camuffo <68204638+camuffo@users.noreply.github.com> Date: Tue, 9 Jan 2024 10:15:40 +0100 Subject: [PATCH 3/3] Don't quote GEOSERVER_JAVA_OPTS in .env (#503) Quoted JAVA_OPTS causes issues in Docker Swarm deploys: the whole value is parsed and passed to Java as a single option. Co-authored-by: Giovanni Allegri --- .env.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.sample b/.env.sample index 7e63ada1..b793df8d 100644 --- a/.env.sample +++ b/.env.sample @@ -108,7 +108,7 @@ OGC_REQUEST_POOL_CONNECTIONS=10 # Java Options & Memory ENABLE_JSONP=true outFormat=text/javascript -GEOSERVER_JAVA_OPTS='-Djava.awt.headless=true -Xms4G -Xmx4G -Dgwc.context.suffix=gwc -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:PerfDataSamplingInterval=500 -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:-UseGCOverheadLimit -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={geoserver_ui}/geoserver/pdf -DALLOW_ENV_PARAMETRIZATION=true -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3-Unsafe.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine' +GEOSERVER_JAVA_OPTS=-Djava.awt.headless=true -Xms4G -Xmx4G -Dgwc.context.suffix=gwc -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:PerfDataSamplingInterval=500 -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:-UseGCOverheadLimit -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={geoserver_ui}/geoserver/pdf -DALLOW_ENV_PARAMETRIZATION=true -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3-Unsafe.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine # ################# # Security