diff --git a/.gitignore b/.gitignore index b0ca371..872fc7f 100644 --- a/.gitignore +++ b/.gitignore @@ -180,3 +180,4 @@ htmlcov/ db_data .direnv /result +/static/ diff --git a/docker-compose.yml b/docker-compose.yml index f9195a2..2d49a69 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,14 +10,14 @@ services: - ./db_data:/var/lib/postgresql/data/ web: - image: ghcr.io/nebucatnetzer/network_inventory/network_inventory:master - # build: . + image: ghcr.io/nebucatnetzer/network_inventory/network-inventory volumes: - - .:/code + - ./static/:/code/static environment: - DJANGO_SETTINGS_MODULE - DJANGO_DEBUG - DJANGO_SECRET_KEY + - "DJANGO_POSTGRES_PASSWORD=${POSTGRES_PASSWORD}" depends_on: - db diff --git a/src/network_inventory/settings/production.py b/src/network_inventory/settings/production.py index bf2f859..4b871d6 100644 --- a/src/network_inventory/settings/production.py +++ b/src/network_inventory/settings/production.py @@ -15,7 +15,7 @@ ALLOWED_HOSTS = [ ] # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = os.getenv("SECRET_KEY") +SECRET_KEY = os.getenv("DJANGO_SECRET_KEY") # SECURITY WARNING: don't run with debug turned on in production! DEBUG = False @@ -26,6 +26,7 @@ DATABASES = { "ENGINE": "django.db.backends.postgresql", "NAME": "postgres", "USER": "postgres", + "PASSWORD": os.environ.get("DJANGO_POSTGRES_PASSWORD"), "HOST": "db", "PORT": 5432, }