Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 22 commits into from
Jul 27, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
98d0ef3
- Updating docker-compose tags, images versions and .envs - Bump Po…
afabiani Jun 26, 2023
3582a0b
- Fix tests
afabiani Jun 26, 2023
62dba6c
Merge branch 'master' into upd_docker_images_tags
afabiani Jun 26, 2023
ee95e74
Merge branch 'master' into upd_docker_images_tags
afabiani Jun 26, 2023
0b25dd7
Merge branch 'master' into upd_docker_images_tags
afabiani Jun 26, 2023
281df32
Merge branch 'master' into upd_docker_images_tags
afabiani Jun 26, 2023
e582cb6
Merge branch 'master' into upd_docker_images_tags
afabiani Jun 27, 2023
59123d8
Merge branch 'master' into upd_docker_images_tags
afabiani Jun 30, 2023
b1e34e2
- Upgrade "letsencrypt" to "alpine:latest" base image
afabiani Jun 30, 2023
f72dec7
Merge branch 'master' into upd_docker_images_tags
afabiani Jul 3, 2023
43d4cbf
Bump nginx tag to 1.25.1-alpine
afabiani Jul 5, 2023
e5a7068
Merge branch 'master' into upd_docker_images_tags
afabiani Jul 5, 2023
aa9e56d
Merge branch 'master' of https://github.com/GeoNode/geonode into upd_…
afabiani Jul 10, 2023
e156586
- Update images versions
afabiani Jul 10, 2023
88ffb22
Merge branch 'master' into upd_docker_images_tags
afabiani Jul 12, 2023
db74d99
Merge branch 'master' into upd_docker_images_tags
afabiani Jul 12, 2023
7cea921
Merge branch 'master' of https://github.com/GeoNode/geonode into upd_…
afabiani Jul 19, 2023
7d57e8b
Merge branch 'upd_docker_images_tags' of https://github.com/GeoNode/g…
afabiani Jul 19, 2023
7a46d66
Merge branch 'master' into upd_docker_images_tags
afabiani Jul 19, 2023
1d7b65b
Merge branch 'master' into upd_docker_images_tags
afabiani Jul 19, 2023
ed41396
Merge branch 'master' into upd_docker_images_tags
afabiani Jul 19, 2023
682d710
Merge branch 'master' into upd_docker_images_tags
afabiani Jul 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
- Updating docker-compose tags, images versions and .envs� - Bump Po…
…stgres Image from 13 to 15
  • Loading branch information
afabiani committed Jun 26, 2023
commit 98d0ef3adf78875490b4f34866a15f9303ebbefc
18 changes: 10 additions & 8 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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', '*']

Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .env_dev
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .env_local
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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', '*']"

Expand Down
6 changes: 4 additions & 2 deletions .env_test
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
28 changes: 14 additions & 14 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -85,7 +85,7 @@ services:
- LETSENCRYPT_MODE=${LETSENCRYPT_MODE}
volumes:
- nginx-certificates:/geonode-certificates
restart: on-failure
restart: unless-stopped

# Geoserver backend
geoserver:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/letsencrypt/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.16
FROM alpine:3.18

RUN apk add --no-cache certbot

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/nginx/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM nginx:1-alpine
FROM nginx:alpine

RUN apk add --no-cache openssl inotify-tools

Expand Down
2 changes: 1 addition & 1 deletion start_django_async.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down