Skip to content

Commit 28cef04

Browse files
committed
cleanup docker files
1 parent 5cdf59c commit 28cef04

File tree

6 files changed

+24
-103
lines changed

6 files changed

+24
-103
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ target/
6969
local_test
7070
src/envs/*
7171
!src/envs/.env.template
72+
!src/envs/.env.docker-compose.template
7273
src/logs
7374
django_project/yarn.lock
7475
django_project/__version__.py

src/django_project/web/templates/web/full/about.html

Whitespace-only changes.

src/docker/docker-compose.yaml

Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,15 @@
1-
networks:
2-
web:
3-
external: true
4-
51
services:
62
django:
7-
container_name: django
83
image: ghcr.io/spokanetech/spokanepythonweb:latest
4+
container_name: django
95
build:
106
context: ../..
117
dockerfile: src/docker/Dockerfile
128
env_file:
139
- ../envs/.env.docker-compose
14-
command: "./entrypoint.sh"
15-
labels:
16-
- "traefik.enable=true"
17-
18-
# Router for HTTPS
19-
- "traefik.http.routers.django.rule=Host(`davidslusser.website`) || Host(`www.davidslusser.website`)"
20-
- "traefik.http.routers.django.entrypoints=websecure"
21-
- "traefik.http.routers.django.tls.certresolver=myresolver"
22-
23-
# Service settings
24-
- "traefik.http.services.django.loadbalancer.server.port=8000"
25-
networks:
26-
- web
10+
command: ./entrypoint.sh
11+
ports:
12+
- "8000:8000"
2713
depends_on:
2814
- db
2915
restart: unless-stopped
@@ -37,8 +23,6 @@ services:
3723
- "5432:5432"
3824
env_file:
3925
- ../envs/.env.docker-compose
40-
networks:
41-
- web
4226
restart: unless-stopped
4327

4428
volumes:

src/docker/local-compose.yaml

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/docker/traefik-compose.yaml

Lines changed: 0 additions & 54 deletions
This file was deleted.
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
DEBUG=False
2+
SECRET_KEY=
3+
ALLOWED_HOSTS=localhost,127.0.0.1
4+
INTERNAL_IPS=localhost,127.0.0.1
5+
DEPLOYMENT_ENV=local
6+
DJANGO_SETTINGS_MODULE=core.settings
7+
LOG_PATH=/var/log/web
8+
DB_ENGINE=django.db.backends.postgresql
9+
DB_NAME=web
10+
DB_USER=
11+
DB_PASSWORD=
12+
DB_HOST=db
13+
DB_PORT=5432
14+
PROJECT_NAME=web
15+
POSTGRES_USER=
16+
POSTGRES_PASSWORD=
17+
POSTGRES_DB=web
18+
DJANGO_ADMIN_USERNAME=
19+
DJANGO_ADMIN_PASSWORD=

0 commit comments

Comments
 (0)