From e3446e9814b3800151f84e4796fb06a1be3194a1 Mon Sep 17 00:00:00 2001
From: bmen <bastian@bmen.cc>
Date: Thu, 8 Oct 2020 12:23:59 +0200
Subject: [PATCH] drone ohne Postgres oder extra Agent Container

---
 docker-compose.yml | 76 +++++++++++++---------------------------------
 1 file changed, 21 insertions(+), 55 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0e59880..5a9a6f0 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,66 +1,32 @@
 version: "2"
 
 networks:
+  webproxy:
+    external: true
+
   backend-gitea:
     external: true
 
 services:
-  drone-server:
-    image: drone/drone:1.2.1
-    container_name: drone-server
-    ports:
-      - 8888:8888
-    volumes:
-      - /opt/appdata/drone/drone-server:/var/lib/drone/
+  drone:
+    container_name: drone
+    image: drone/drone:1.9
     restart: always
     environment:
-      - DRONE_OPEN=true
-      - DRONE_GITEA=true
-      - DRONE_NETWORK=backend-gitea
-      - DRONE_DEBUG=true
-      - DRONE_ADMIN=${DRONE_ADMIN}
-      - DRONE_USER_CREATE=username:${DRONE_ADMIN},admin:true
-      - DRONE_SERVER_PORT=:8888
-      - DRONE_DATABASE_DRIVER=postgres
-      - DRONE_DATABASE_DATASOURCE=postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@db:5432/${POSTGRES_DB}?sslmode=disable
-      - DRONE_GIT_ALWAYS_AUTH=false
-      - DRONE_GITEA_SERVER=https://git.bmen.cc
-      - DRONE_RPC_SECRET=§{DRONE_RPC_SECRET}
-      - DRONE_SERVER_HOST=0.0.0.0:8888
-      - DRONE_HOST=http://0.0.0.0:8888
-      - DRONE_SERVER_PROTO=http
-      - DRONE_TLS_AUTOCERT=false
-      - DRONE_AGENTS_ENABLED=true
-    networks:
-      - backend-gitea
-
-  drone-db:
-    image: postgres:alpine
-    container_name: drone-db
-    restart: always
+       - DRONE_GITEA_SERVER=https://git.bmen.cc
+       - DRONE_GIT_ALWAYS_AUTH=false
+       - DRONE_RUNNER_CAPACITY=1
+       - DRONE_SERVER_HOST=drone.bmen.cc
+       - DRONE_SERVER_PROTO=https
+       - DRONE_TLS_AUTOCERT=false
+       - DRONE_GITEA_CLIENT_ID=client-id
+       - DRONE_GITEA_CLIENT_SECRET=client-secret
+       - VIRTUAL_HOST=drone.bmen.cc
+       - VIRTUAL_PORT=80
+       - DRONE_USER_CREATE=username:${DRONE_ADMIN},admin:true
     volumes:
-      - /opt/appdata/drone/drone-db:/var/lib/postgresql/data
-    environment:
-      - POSTGRES_USER=${POSTGRES_USER}
-      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
-      - POSTGRES_DB=${POSTGRES_DB}
+       - /var/run/docker.sock:/var/run/docker.sock
+       - /opt/appdata/drone/drone-db:/data
     networks:
-      - backend-gitea
-
-  drone-agent:
-    image: drone/agent:1.2.1
-    container_name: drone-agent
-    command: agent
-    restart: always
-    depends_on:
-      - drone-server
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - /opt/appdata/drone/drone-agent:/data
-    environment:
-      - DRONE_RPC_SERVER=http://0.0.0.0:8888
-      - DRONE_RPC_SECRET=§{DRONE_RPC_SECRET}
-      - DRONE_RUNNER_CAPACITY=1
-      - DRONE_RUNNER_NETWORKS=backend-gitea
-    networks:
-      - backend-gitea
\ No newline at end of file
+       - backend-gitea
+       - webproxy
\ No newline at end of file