From 69a40c101c54085fbc91f83d75b4f037afeaaff3 Mon Sep 17 00:00:00 2001 From: kev Date: Sun, 20 Oct 2019 08:23:47 +0800 Subject: [PATCH] upgrade drone to 1.6 --- drone/arm/docker-compose.yml | 21 +++++---------------- drone/docker-compose.yml | 5 +++-- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/drone/arm/docker-compose.yml b/drone/arm/docker-compose.yml index 176706e..009117c 100644 --- a/drone/arm/docker-compose.yml +++ b/drone/arm/docker-compose.yml @@ -1,8 +1,9 @@ version: '3.7' services: + drone: - image: drone/drone:1.5-linux-arm + image: drone/drone:1.6-linux-arm ports: - "8080:80" volumes: @@ -11,8 +12,8 @@ services: - 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_DATABASE_DRIVER=sqlite3 + - DRONE_DATABASE_DATASOURCE=/data/database.sqlite - DRONE_GOGS_SERVER=http://gogs:3000 - DRONE_AGENTS_ENABLED=true depends_on: @@ -21,7 +22,7 @@ services: restart: always agent: - image: drone/agent:1.5-linux-arm + image: drone/agent:1.6-linux-arm volumes: - /var/run/docker.sock:/var/run/docker.sock environment: @@ -34,18 +35,6 @@ services: - drone restart: always - postgres: - image: arm32v7/postgres:12-alpine - ports: - - "5432:5432" - volumes: - - ./data/postgres:/var/lib/postgresql/data - environment: - - POSTGRES_USER=drone - - POSTGRES_PASSWORD=drone - - POSTGRES_DB=drone - restart: always - gogs: image: easypi/gogs-arm ports: diff --git a/drone/docker-compose.yml b/drone/docker-compose.yml index dc50112..299018d 100644 --- a/drone/docker-compose.yml +++ b/drone/docker-compose.yml @@ -1,8 +1,9 @@ version: "3.7" services: + drone: - image: drone/drone:1.5-linux-amd64 + image: drone/drone:1.6-linux-amd64 ports: - "8080:80" volumes: @@ -21,7 +22,7 @@ services: restart: always agent: - image: drone/agent:1.5-linux-amd64 + image: drone/agent:1.6-linux-amd64 volumes: - /var/run/docker.sock:/var/run/docker.sock environment: