aboutsummaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--docker-compose.yml4
-rwxr-xr-xdocker/app/migrate_and_serve.sh5
-rw-r--r--docker/pysite.dockerapp2
3 files changed, 10 insertions, 1 deletions
diff --git a/docker-compose.yml b/docker-compose.yml
index 04ec51de..0c504c40 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,6 +12,8 @@ version: "3.6"
services:
postgres:
image: postgres:11-alpine
+ ports:
+ - "127.0.0.1:7777:5432"
environment:
POSTGRES_DB: pysite
POSTGRES_PASSWORD: supersecretpassword
@@ -30,7 +32,7 @@ services:
- .:/app:ro
- staticfiles:/var/www/static
environment:
- DATABASE_URL: postgres://pysite:supersecretpassword@postgres/pysite
+ DATABASE_URL: postgres://pysite:supersecretpassword@postgres:5432/pysite
DEBUG: "true"
SECRET_KEY: suitable-for-development-only
STATIC_ROOT: /var/www/static
diff --git a/docker/app/migrate_and_serve.sh b/docker/app/migrate_and_serve.sh
index 2fe7841f..42bf67a3 100755
--- a/docker/app/migrate_and_serve.sh
+++ b/docker/app/migrate_and_serve.sh
@@ -9,7 +9,12 @@
echo [i] Applying migrations.
python manage.py migrate --verbosity 1
+
echo [i] Collecting static files.
python manage.py collectstatic --no-input --clear --verbosity 0
+
+echo [i] Creating a superuser.
+echo "from django.contrib.auth import get_user_model; User = get_user_model(); User.objects.create_superuser('admin', 'admin', 'admin') if not User.objects.filter(username='admin').exists() else print('Admin user already exists')" | python manage.py shell
+
echo [i] Starting server.
python manage.py runserver 0.0.0.0:8000
diff --git a/docker/pysite.dockerapp b/docker/pysite.dockerapp
index dc472b2e..2426008e 100644
--- a/docker/pysite.dockerapp
+++ b/docker/pysite.dockerapp
@@ -25,6 +25,8 @@ services:
postgres:
image: postgres:11-alpine
+ ports:
+ - "127.0.0.1:5432:5432"
environment:
POSTGRES_DB: "${pg_db}"
POSTGRES_USER: "${pg_user}"