more docker updates

This commit is contained in:
Ross
2025-12-01 13:31:08 +00:00
parent fd6e25d55e
commit 9ed789ba90
11 changed files with 206 additions and 20 deletions
+23
View File
@@ -0,0 +1,23 @@
DEBUG=1
SECRET_KEY=w(s0&(_eb058wvmg@44_repv8)r9@5p8fx*g_@c)1dm&d*ew^u
DJANGO_ALLOWED_HOSTS=localhost 127.0.0.1 [::1]
DB_NAME=rad
DB_HOST=db
DB_USER=django
DB_PASSWORD=postgres
DB_PORT=5432
MEMCACHE_HOST=cache
# DEV-specific vars used by rad/settings_local.py
DEV_USE_POSTGRES=1
DEV_DB_NAME=${DB_NAME}
DEV_DB_USER=${DB_USER}
DEV_DB_PASSWORD=${DB_PASSWORD}
DEV_DB_HOST=${DB_HOST}
DEV_DB_PORT=${DB_PORT}
# pgAdmin creds
PGADMIN_DEFAULT_EMAIL=admin@example.com
PGADMIN_DEFAULT_PASSWORD=admin
+6 -4
View File
@@ -5,8 +5,10 @@ services:
web:
env_file:
- ../.env.dev
nginx:
ports:
- "8080:80"
- "8443:443"
# Development nginx override: mount a simplified config that does not
# reference LetsEncrypt certs so the container can start without real
# certificates present on the host.
volumes:
- ../deploy/nginx/dev.conf:/etc/nginx/conf.d/default.conf:ro
+3 -3
View File
@@ -21,7 +21,7 @@ services:
env_file:
- ../.env.${COMPOSE_ENV:-prod}
environment:
- DJANGO_SETTINGS_MODULE=rad.settings.production
- DJANGO_SETTINGS_MODULE=rad.settings
depends_on:
redis:
condition: service_healthy
@@ -39,8 +39,8 @@ services:
image: nginx:stable-alpine
restart: always
ports:
- "80:80"
- "443:443"
- "${NGINX_HTTP_PORT:-80}:80"
- "${NGINX_HTTPS_PORT:-443}:443"
depends_on:
- web
volumes:
+1 -1
View File
@@ -29,7 +29,7 @@ services:
- 8000:8000
- 3459:3459
env_file:
- ./.env.dev
- ./.env.dev.local
db:
image: postgres:14.2-alpine
volumes: