From 3a55ff55c59e9dc3c68fc5d7a9c8c50fcf2f5c8d Mon Sep 17 00:00:00 2001
From: Austin <austin@Omega.local>
Date: Mon, 23 Mar 2020 16:47:22 -0500
Subject: [PATCH] This works mostly, would be great to get the proxy to work

---
 drone/.env               | 15 +++++++--------
 drone/docker-compose.yml | 10 ++++++++--
 gitea/docker-compose.yml | 11 ++++++++++-
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/drone/.env b/drone/.env
index e33965f..4bc2a0c 100644
--- a/drone/.env
+++ b/drone/.env
@@ -1,12 +1,11 @@
-
-DRONE_GITEA_SERVER=http://127.0.0.1:3000
-DRONE_GITEA_CLIENT_ID=29d717db-397a-4865-9854-d59f6ae0fcb8
-DRONE_GITEA_CLIENT_SECRET=pZcM6cj0iE_WfZXzsxLfs_SlHtW82Vb0NcvMM2D73ZE=
-DRONE_RPC_SECRET=fe41e7ac77fcbb22c3c4a832012f07bb
-DRONE_SERVER_HOST=127.0.0.1:8000
+DRONE_GITEA_SERVER=http://git.07fi.net:3000
+DRONE_GITEA_CLIENT_ID=6e80c400-ad17-4dda-b68e-0136b1677e37
+DRONE_GITEA_CLIENT_SECRET=bdRzHP9GqSvb7Dmqm7g1mkCHjXadXd74AEHtw8VPl8E=
+DRONE_RPC_SECRET=a1cf994eee95899f31f296c25d8310f0
+DRONE_SERVER_HOST=drone.07fi.net:8000
 DRONE_SERVER_PROTO=http
 
 DRONE_RPC_PROTO=http
-DRONE_RPC_HOST=127.0.0.1:8000
+DRONE_RPC_HOST=drone.07fi.net:8000
 DRONE_RUNNER_CAPACITY=2
-DRONE_RUNNER_NAME=drone-runner
\ No newline at end of file
+DRONE_RUNNER_NAME=drone-runner
diff --git a/drone/docker-compose.yml b/drone/docker-compose.yml
index 82fc543..cf6e584 100644
--- a/drone/docker-compose.yml
+++ b/drone/docker-compose.yml
@@ -19,7 +19,11 @@ services:
       - DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
       - DRONE_SERVER_HOST=${DRONE_SERVER_HOST}
       - DRONE_SERVER_PROTO=${DRONE_SERVER_PROTO}
-      - TZ=Asia/Shanghai
+      - DRONE_DATABASE_DATASOURCE=/var/lib/drone/database.sqlite
+      - DRONE_DATABASE_DRIVER=sqlite3
+      - TZ=America/Chicago
+      - VIRTUAL_PORT=8000
+      - VIRTUAL_HOST=drone.07fi.net
 
   drone-runner:
     image: drone/drone-runner-docker:1
@@ -32,7 +36,7 @@ services:
       - DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
       - DRONE_RUNNER_CAPACITY=${DRONE_RUNNER_CAPACITY}
       - DRONE_RUNNER_NAME=${DRONE_RUNNER_NAME}
-      - TZ=Asia/Shanghai
+      - TZ=America/Chicago
     depends_on:
       - drone
     restart: always
@@ -41,3 +45,5 @@ services:
       
 networks:
   default:
+   external:
+    name: gitea_default
diff --git a/gitea/docker-compose.yml b/gitea/docker-compose.yml
index f577e79..2816b64 100644
--- a/gitea/docker-compose.yml
+++ b/gitea/docker-compose.yml
@@ -1,5 +1,12 @@
 version: "3"
 services:
+  nginx-proxy:
+    image: jwilder/nginx-proxy
+    ports:
+      - "80:80"
+    volumes:
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+      - ./vhost:/etc/nginx/vhost.d:ro
   gitea:
     image: gitea/gitea:1
     container_name: gitea
@@ -11,9 +18,11 @@ services:
       - /etc/localtime:/etc/localtime:ro
       - ./data:/data
     environment:
+      - VIRTUAL_PORT=3000
+      - VIRTUAL_HOST=git.07fi.net
       - USER_UID=1000
       - USER_GID=1000
-      - TZ=Asia/Shanghai
+      - TZ=America/Chicago
     restart: always
     networks:
       - default