From 50d17c6c3cd992e0f2d90f6062e2e67bca61f026 Mon Sep 17 00:00:00 2001
From: simon <simobilleter@gmail.com>
Date: Wed, 11 May 2022 23:17:11 +0700
Subject: [PATCH] add drone, split networks in compose

---
 .gitignore                    |  1 +
 docker-compose_production.yml | 57 ++++++++++++++++++++++++++++++++++-
 env/drone.sample.env          |  9 ++++++
 3 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 env/drone.sample.env

diff --git a/.gitignore b/.gitignore
index d9df79e..a05f57c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ config.json
 postgres.env
 tubearchivist.env
 umami.env
+drone.env
 
 # example hooks
 docker-hook.json
diff --git a/docker-compose_production.yml b/docker-compose_production.yml
index d01d3a4..77b8e71 100644
--- a/docker-compose_production.yml
+++ b/docker-compose_production.yml
@@ -12,6 +12,11 @@ services:
       - ./volume/nginx-proxy/vhost:/etc/nginx/vhost.d
       - ./volume/nginx-proxy/html:/usr/share/nginx/html
       - /var/run/docker.sock:/tmp/docker.sock:ro
+    networks:
+      - front
+      - tubearchivist_network
+      - umami_network
+      - drone_network
   nginx-proxy-acme:
     image: nginxproxy/acme-companion
     container_name: nginx-proxy-acme
@@ -23,6 +28,9 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock:ro
     environment:
       - NGINX_PROXY_CONTAINER=nginx-proxy
+    networks:
+      - front
+  # main flask site
   nginx:
     build: ./tubearchivist/nginx
     container_name: backend_nginx
@@ -34,7 +42,8 @@ services:
     environment:
       - VIRTUAL_HOST=tubearchivist.com,www.tubearchivist.com
       - LETSENCRYPT_HOST=tubearchivist.com,www.tubearchivist.com
-  # main flask site
+    networks:
+      - tubearchivist_network
   tubearchivist:
     container_name: tubearchivist
     build: ./tubearchivist/web
@@ -43,6 +52,8 @@ services:
       - ./env/tubearchivist.env
     expose:
       - "8080"
+    networks:
+      - tubearchivist_network
   # backend postgres
   postgres:
     image: postgres:14
@@ -54,6 +65,8 @@ services:
       - ./env/postgres.env
     expose:
       - "5432"
+    networks:
+      - tubearchivist_network
   # umami stats
   umami:
     image: ghcr.io/mikecao/umami:postgresql-latest
@@ -68,6 +81,8 @@ services:
     depends_on:
       - umami-db
     restart: always
+    networks:
+      - umami_network
   umami-db:
     image: postgres:14
     container_name: umami-db
@@ -77,3 +92,43 @@ services:
       - ./volume/umami/schema.postgresql.sql:/docker-entrypoint-initdb.d/schema.postgresql.sql:ro
       - ./volume/umami/db:/var/lib/postgresql/data
     restart: always
+    networks:
+      - umami_network
+  # drone build server
+  drone:
+    image: drone/drone:2
+    container_name: drone
+    expose:
+      - "80"
+    env_file:
+      - ./env/drone.env
+    environment:
+      - VIRTUAL_HOST=www.drone.tubearchivist.com,drone.tubearchivist.com
+      - LETSENCRYPT_HOST=www.drone.tubearchivist.com,drone.tubearchivist.com
+    volumes:
+      - ./volume/drone/server:/data
+    restart: always
+    networks:
+      - drone_network
+  drone-runner:
+    image: drone/drone-runner-docker
+    container_name: drone-runner
+    expose:
+      - "3000"
+    env_file:
+      - ./env/drone.env
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    restart: always
+    networks:
+      - drone_network
+
+networks:
+  front:
+    driver: bridge
+  tubearchivist_network:
+    driver: bridge
+  umami_network:
+    driver: bridge
+  drone_network:
+    driver: bridge
diff --git a/env/drone.sample.env b/env/drone.sample.env
new file mode 100644
index 0000000..59a430c
--- /dev/null
+++ b/env/drone.sample.env
@@ -0,0 +1,9 @@
+DRONE_GITHUB_CLIENT_ID=aaaaaaaaaaaa
+DRONE_GITHUB_CLIENT_SECRET=bbbbbbbbbbbbbbbbb
+DRONE_RPC_SECRET=ccccccccccccc
+DRONE_SERVER_HOST=www.drone.tubearchivist.com
+DRONE_SERVER_PROTO=https
+DRONE_RUNNER_CAPACITY=1
+DRONE_RUNNER_NAME=tubearchivist
+DRONE_RPC_PROTO=https
+DRONE_RPC_HOST=www.drone.tubearchivist.com