From 8755a93a2866f7a4b94e3e0493f07141f55d03b1 Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Mon, 23 Sep 2019 20:07:15 +1000
Subject: Add a dev-only compose for new devs who don't have `site`.

---
 docker-compose.yml | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 docker-compose.yml

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
new file mode 100644
index 000000000..1c55482dc
--- /dev/null
+++ b/docker-compose.yml
@@ -0,0 +1,28 @@
+# This docker compose is used for quick setups of the site and database which
+# the bot project relies on for testing. Use it if you haven't got a
+# ready-to-use site environment already setup.
+
+version: "3.7"
+
+services:
+  postgres:
+    image: postgres:11-alpine
+    ports:
+      - "127.0.0.1:7777:5432"
+    environment:
+      POSTGRES_DB: pysite
+      POSTGRES_PASSWORD: pysite
+      POSTGRES_USER: pysite
+
+  web:
+    image: pythondiscord/site:latest
+    command: "./manage.py runserver 0.0.0.0:8000"
+    ports:
+      - "127.0.0.1:8000:8000"
+    depends_on:
+      - postgres
+    environment:
+      DATABASE_URL: postgres://pysite:pysite@postgres:5432/pysite
+      DEBUG: "true"
+      SECRET_KEY: suitable-for-development-only
+      STATIC_ROOT: /var/www/static
-- 
cgit v1.2.3


From 83ce5184a5f4edf40abeeb42214261450095aeff Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Tue, 24 Sep 2019 14:45:24 +1000
Subject: Create default django admin user.

---
 docker-compose.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 1c55482dc..4b0dcff35 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,9 @@ services:
 
   web:
     image: pythondiscord/site:latest
-    command: "./manage.py runserver 0.0.0.0:8000"
+    command: >
+      bash -c "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
+      && ./manage.py runserver 0.0.0.0:8000"
     ports:
       - "127.0.0.1:8000:8000"
     depends_on:
-- 
cgit v1.2.3


From c11dc54d530303fb2a205be319d14dd1371dd0d3 Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Sat, 28 Sep 2019 23:51:15 +1000
Subject: Update site to use new manage.py, add bot dev compose.

---
 docker-compose.yml | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 4b0dcff35..045703402 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,24 +7,37 @@ version: "3.7"
 services:
   postgres:
     image: postgres:11-alpine
-    ports:
-      - "127.0.0.1:7777:5432"
     environment:
       POSTGRES_DB: pysite
       POSTGRES_PASSWORD: pysite
       POSTGRES_USER: pysite
 
   web:
-    image: pythondiscord/site:latest
-    command: >
-      bash -c "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
-      && ./manage.py runserver 0.0.0.0:8000"
+    image: pythondiscord/site:dev
+    command: ["run", "--debug"]
+    networks:
+      default:
+        aliases:
+          - api.web
+          - admin.web
+          - staff.web
     ports:
       - "127.0.0.1:8000:8000"
     depends_on:
       - postgres
     environment:
       DATABASE_URL: postgres://pysite:pysite@postgres:5432/pysite
-      DEBUG: "true"
       SECRET_KEY: suitable-for-development-only
       STATIC_ROOT: /var/www/static
+
+  bot:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    volumes:
+      - ./logs:/bot/logs
+      - .:/bot:ro
+    environment:
+      BOT_TOKEN: ${BOT_TOKEN}
+      BOT_API_KEY: badbot13m0n8f570f942013fc818f234916ca531
+      DATABASE_URL: postgres://pysite:pysite@postgres:5432/pysite
-- 
cgit v1.2.3


From d05e74c201fc785b96b8afd0dff94c2831179aba Mon Sep 17 00:00:00 2001
From: scragly <29337040+scragly@users.noreply.github.com>
Date: Mon, 30 Sep 2019 13:35:27 +1000
Subject: Make `bot` wait for `web`, use `latest` web image.

---
 docker-compose.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'docker-compose.yml')

diff --git a/docker-compose.yml b/docker-compose.yml
index 045703402..9684a3c62 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
       POSTGRES_USER: pysite
 
   web:
-    image: pythondiscord/site:dev
+    image: pythondiscord/site:latest
     command: ["run", "--debug"]
     networks:
       default:
@@ -37,7 +37,8 @@ services:
     volumes:
       - ./logs:/bot/logs
       - .:/bot:ro
+    depends_on:
+      - web
     environment:
       BOT_TOKEN: ${BOT_TOKEN}
       BOT_API_KEY: badbot13m0n8f570f942013fc818f234916ca531
-      DATABASE_URL: postgres://pysite:pysite@postgres:5432/pysite
-- 
cgit v1.2.3