update gogs

drone/arm/Dockerfile

@@ -1,23 +0,0 @@
-#
-# Dockerfile for drone-arm
-#
-
-FROM easypi/alpine-arm
-MAINTAINER EasyPi Software Foundation
-
-RUN apk add --no-cache ca-certificates
-
-ADD drone /drone
-
-ENV DATABASE_DRIVER=sqlite3 \
-    DATABASE_CONFIG=/var/lib/drone/drone.sqlite \
-    GODEBUG=netdns=go \
-    XDG_CACHE_HOME=/var/lib/drone
-
-VOLUME $XDG_CACHE_HOME
-WORKDIR $XDG_CACHE_HOME
-
-EXPOSE 8000
-
-ENTRYPOINT ["/drone"]
-CMD ["server"]

drone/arm/README.md

@@ -1,24 +1,6 @@
 drone-arm
 =========
 
-```yaml
-drone:
-  image: armdrone/drone
-  ports:
-    - "8000:80"
-  volumes:
-    - ./data:/var/lib/drone
-    - /var/run/docker.sock:/var/run/docker.sock
-  environment:
-    - REMOTE_DRIVER=gogs
-    - REMOTE_CONFIG=http://git.easypi.info:3000/?open=false
-    - PLUGIN_FILTER=armdrone/*
-    - GIN_MODE=release
-  extra_hosts:
-    - git.easypi.info:192.168.31.231
-  restart: always
-```
-
 ## Deploy Key Setup
 
 ```yaml

drone/arm/docker-compose.yml

@@ -1,45 +1,49 @@
-version: '2'
+version: '3.7'
 
 services:
-  drone-server:
-    image: quay.io/armswarm/drone:0.8
+  drone:
+    image: drone/drone:1.5-linux-arm
     ports:
-      -  "8000:8000"
-      -  "9000:9000"
+      -  "8080:80"
     volumes:
-      - ./data/drone:/var/lib/drone
+      - ./data/drone:/data
     environment:
-      - DRONE_OPEN=true
-      - DRONE_HOST=https://drone.easypi.pro
-      - DRONE_DATABASE_DRIVER=mysql
-      - DRONE_DATABASE_DATASOURCE=root:root@tcp(mariadb:3306)/drone?parseTime=true
-      - DRONE_GOGS=true
-      - DRONE_GOGS_URL=https://gogs.easypi.pro
-      - DRONE_SECRET=0123456789
-      - DRONE_ADMIN=root
+      - DRONE_SERVER_HOST=drone
+      - DRONE_SERVER_PROTO=http
+      - DRONE_RPC_SECRET=secret
+      - DRONE_DATABASE_DRIVER=postgres
+      - DRONE_DATABASE_DATASOURCE=postgres://drone:drone@postgres:5432/drone?sslmode=disable
+      - DRONE_GOGS_SERVER=http://gogs:3000
+      - DRONE_AGENTS_ENABLED=true
     depends_on:
-      - mariadb
+      - postgres
       - gogs
     restart: always
 
-  drone-agent:
-    image: drone/agent:linux-arm
+  agent:
+    image: drone/agent:1.5-linux-arm
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     environment:
-      - DRONE_SERVER=drone-server:9000
-      - DRONE_SECRET=0123456789
+      - DRONE_RPC_PROTO=http
+      - DRONE_RPC_HOST=drone
+      - DRONE_RPC_SECRET=secret
+      - DRONE_RUNNER_NAME=agent
+      - DRONE_RUNNER_CAPACITY=2
     depends_on:
-      - drone-server
+      - drone
     restart: always
 
-  mariadb:
-    image: easypi/mariadb-arm
+  postgres:
+    image: arm32v7/postgres:12-alpine
     ports:
-      - "3306:3306"
+      - "5432:5432"
+    volumes:
+      - ./data/postgres:/var/lib/postgresql/data
     environment:
-      - MYSQL_ROOT_PASSWORD=root
-      - MYSQL_DATABASE=drone
+      - POSTGRES_USER=drone
+      - POSTGRES_PASSWORD=drone
+      - POSTGRES_DB=drone
     restart: always
 
   gogs:
@@ -50,12 +54,3 @@ services:
     volumes:
       - ./data/gogs:/data
     restart: always
-
-  phpmyadmin:
-    image: easypi/phpmyadmin-arm
-    ports:
-      - "8080:80"
-    environment:
-      - PMA_HOST=mariadb
-      - PMA_PORT=3306
-    restart: always