diff --git a/.env.example b/.env.example index 4ae2841..14b70e7 100644 --- a/.env.example +++ b/.env.example @@ -4,6 +4,10 @@ SENTRY_DSN=https://460e310d034c49a794941e087c4fcc6e@sentry.io/1196285 DEFAULT_HAYSTACK_URL=es+https://tcjf1ngoog:qj70l67kk2@tagesschule-elementa-8329801232.eu-west-1.bonsaisearch.net/index-* DATABASE_URL=postgres://django:MuzQzD6yLyaksfw9f6NUDLsK6Tp7gD7f8uX@postgres:5432/db HTTP_PORT=8009 -HTTPS_PORT=4047 POSTGRES_PASSWORD=MuzQzD6yLyaksfw9f6NUDLsK6Tp7gD7f8uX POSTGRES_USER=django +POSTGRES_DB=db +POSTGRES_DATA_DIR=./docker/pgdata +MEDIA_DIR=./docker/data/media +DATA_DIR=./docker/data +STATIC_DIR=./docker/static_collected diff --git a/README.md b/README.md index edac68d..5d452ad 100644 --- a/README.md +++ b/README.md @@ -5,8 +5,8 @@ 1. Copy environment files `.env*.example` to `.env*` and make the configuration changes. Configure database user and ports for docker. - - HTTP_PORT=8009 [.env] - - HTTPS_PORT=4047 [.env] + - HTTP_PORT=8009 [.env] ... + 2. Main app has several mountpoints / volumes. Point them into the appropriate location on your filesystem diff --git a/docker-compose.yml b/docker-compose.yml index b42ef07..0801668 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,10 +6,10 @@ services: links: - "db:postgres" volumes: - - ".:/app:rw" - - "./docker/data:/data:rw" - - ./docker/static_collected:/app/static_collected - - ./docker/data/media:/app/data/media + - .:/app:rw + - ${DATA_DIR}:/data:rw + - ${STATIC_DIR}:/app/static_collected + - ${MEDIA_DIR}:/app/data/media networks: - db_network command: "/bin/sh -c '/app/wait-for-postgres.sh postgres /app/run.sh'" @@ -22,7 +22,7 @@ services: env_file: - ./.env-db volumes: - - "./docker/pgdata:/var/lib/postgresql/data:rw" + - ${POSTGRES_DATA_DIR}:/var/lib/postgresql/data:rw networks: - db_network