From 14e2e4092d30c5b4788b9c3854ea94152637edea Mon Sep 17 00:00:00 2001
From: Giles Bradshaw <giles.bradshaw@sigyl.com>
Date: Sun, 10 May 2020 21:04:43 +0100
Subject: [PATCH] .

---
 docker-compose.yml    | 81 ++++++++++++-------------------------------
 drone-starlark/run.sh |  7 ++++
 2 files changed, 30 insertions(+), 58 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 8b78209..c6dad36 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,74 +1,39 @@
 version: "3.7"
 services:
-  drone-server:
-    # drone server application
+  gitea:
     deploy:
       placement:
         constraints: [node.labels.com.sigyl.git-stack == yes]
       replicas: 1
       restart_policy:
         condition: any
-    image: drone/drone:1.7.0
-    volumes:
-      - drone:/var/lib/drone
-      - drone-data:/data
+    image: ${LOCAL_DOCKER_REGISTRY}gitea
     environment:
-      - DRONE_LOGS_DEBUG=true
-      - DRONE_LOGS_PRETTY=true
-      - DRONE_GITEA_SERVER=${DRONE_GITEA_SERVER}
-      - DRONE_GITEA_CLIENT_ID=${DRONE_GITEA_CLIENT_ID}
-      - DRONE_GITEA_CLIENT_SECRET=${DRONE_GITEA_CLIENT_SECRET}
-      - DRONE_SERVER_HOST=${DRONE_SERVER_HOST} # tunnel hostname       
-      - DRONE_ADMIN=giles
-      - DRONE_SERVER_PROTO=https # tunnel adds https on top
-      - DRONE_SERVER_PORT=:8080
-      - DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
-      - DRONE_USER_CREATE=username:giles,admin:true
-      - DRONE_AGENTS_ENABLED=true
-      - DRONE_CONVERT_PLUGIN_ENDPOINT=http://drone-starlark:3000
-      - DRONE_CONVERT_PLUGIN_SECRET=${DRONE_CONVERT_SECRET}
+      - USER_UID=1000
+      - USER_GID=1000
+      - ROOT_URL=https://${GIT_DOMAIN}/git
+      - SSH_DOMAIN=${GIT_DOMAIN}
+      - GITEA_APP_NAME=${GITEA_APP_NAME}
+      - GIT_DOMAIN=${GIT_DOMAIN}
+      - GITEA_SERVER_LFS_JWT_SECRET=$GITEA_SERVER_LFS_JWT_SECRET
+      - GITEA_SECURITY_SECRET_KEY=$GITEA_SECURITY_SECRET_KEY
+      - GITEA_SECURITY_INTERNAL_TOKEN=$GITEA_SECURITY_INTERNAL_TOKEN
+      - GITEA_OAUTH2_JWT_SECRET=$GITEA_OAUTH2_JWT_SECRET
+      - GITEA_MAILER_HOST=$GITEA_MAILER_HOST
+      - GITEA_MAILER_USER=$GITEA_MAILER_USER
+      - GITEA_MAILER_FROM=$GITEA_MAILER_FROM
+      - GITEA_MAILER_PASSWD=$GITEA_MAILER_PASSWD
+
+    volumes:
+      - gitea-app:/data
+    ports:
+      - 3000:3000
+      - 22:22
     networks:
       - appnet
       - externalnet
-  drone-docker-runner:
-    # drone runner performs builds
-    deploy:
-      placement:
-        constraints: [node.labels.com.sigyl.git-stack == yes]
-      replicas: 1
-      restart_policy:
-        condition: any
-    image: drone/drone-runner-docker:1
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      - DRONE_RPC_PROTO=http
-      - DRONE_RPC_HOST=drone-server:8080
-      - DRONE_RPC_SECRET=${DRONE_RPC_SECRET}
-      - DRONE_RUNNER_CAPACITY=8
-      - DRONE_RUNNER_NAME="docker-runner"
-    networks:
-      - appnet
-  drone-starlark:
-    # drone starlark server converts starlark to yaml
-    deploy:
-      placement:
-        constraints: [node.labels.com.sigyl.git-stack == yes]
-      replicas: 1
-      restart_policy:
-        condition: any
-    image: ${LOCAL_DOCKER_REGISTRY}drone-starlark
-    environment:
-      - DRONE_DEBUG=true
-      - DRONE_SECRET=${DRONE_CONVERT_SECRET}
-      - DRONE_STARLARK_REPO_PATHS=this:/repos
-      - SIGYL_STACK_NAME=$SIGYL_STACK_NAME
-      - SIGYL_STACK_ROOT=$SIGYL_STACK_ROOT
-    networks:
-      - appnet
 volumes:
-  drone:
-  drone-data:
+  gitea-app:
 
 networks:
   appnet:
diff --git a/drone-starlark/run.sh b/drone-starlark/run.sh
index fc15d46..4c72b41 100644
--- a/drone-starlark/run.sh
+++ b/drone-starlark/run.sh
@@ -1,9 +1,16 @@
 envsubst < /repos/stack/stack-name._star > /repos/stack/stack-name.star
 envsubst < /repos/stack/stack-root._star > /repos/stack/stack-root.star
+
 envsubst < /repos/proxy/stack-name._star > /repos/proxy/stack-name.star
 envsubst < /repos/proxy/stack-root._star > /repos/proxy/stack-root.star
+
 envsubst < /repos/drone/stack-name._star > /repos/drone/stack-name.star
 envsubst < /repos/drone/stack-root._star > /repos/drone/stack-root.star
+
 envsubst < /repos/ghost/stack-name._star > /repos/ghost/stack-name.star
 envsubst < /repos/ghost/stack-root._star > /repos/ghost/stack-root.star
+
+envsubst < /repos/gitea/stack-name._star > /repos/gitea/stack-name.star
+envsubst < /repos/gitea/stack-root._star > /repos/gitea/stack-root.star
+
 /bin/drone-convert-starlark
\ No newline at end of file