Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ target/
local_test
src/envs/*
!src/envs/.env.template
!src/envs/.env.docker-compose.template
src/logs
django_project/yarn.lock
django_project/__version__.py
Expand Down
Empty file.
24 changes: 4 additions & 20 deletions src/docker/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
networks:
web:
external: true

services:
django:
container_name: django
image: ghcr.io/spokanetech/spokanepythonweb:latest
container_name: django
build:
context: ../..
dockerfile: src/docker/Dockerfile
env_file:
- ../envs/.env.docker-compose
command: "./entrypoint.sh"
labels:
- "traefik.enable=true"

# Router for HTTPS
- "traefik.http.routers.django.rule=Host(`davidslusser.website`) || Host(`www.davidslusser.website`)"
- "traefik.http.routers.django.entrypoints=websecure"
- "traefik.http.routers.django.tls.certresolver=myresolver"

# Service settings
- "traefik.http.services.django.loadbalancer.server.port=8000"
networks:
- web
command: ./entrypoint.sh
ports:
- "8000:8000"
depends_on:
- db
restart: unless-stopped
Expand All @@ -37,8 +23,6 @@ services:
- "5432:5432"
env_file:
- ../envs/.env.docker-compose
networks:
- web
restart: unless-stopped

volumes:
Expand Down
29 changes: 0 additions & 29 deletions src/docker/local-compose.yaml

This file was deleted.

54 changes: 0 additions & 54 deletions src/docker/traefik-compose.yaml

This file was deleted.

19 changes: 19 additions & 0 deletions src/envs/.env.docker-compose.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
DEBUG=True
SECRET_KEY=changeme-in-production # TODO: Replace with a secure random value before deployment
ALLOWED_HOSTS=localhost,127.0.0.1
INTERNAL_IPS=localhost,127.0.0.1
DEPLOYMENT_ENV=local
DJANGO_SETTINGS_MODULE=core.settings
LOG_PATH=/var/log/web
DB_ENGINE=django.db.backends.postgresql
DB_NAME=web
DB_USER=webuser # Example: webuser
DB_PASSWORD=changeme # Example: strongpassword
DB_HOST=db
DB_PORT=5432
PROJECT_NAME=web
POSTGRES_USER=webuser # Example: webuser
POSTGRES_PASSWORD=changeme # Example: strongpassword
POSTGRES_DB=web
DJANGO_ADMIN_USERNAME=admin # Example: admin
DJANGO_ADMIN_PASSWORD=changeme # Example: strongpassword