From 3403fcc84fa882b4e0c2c4b8bcefd40b5e7524bd Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 15 Aug 2021 16:24:32 +0800 Subject: [PATCH 1/3] use woodpecker env variable instead of drone --- docker-compose.example.yml | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/docker-compose.example.yml b/docker-compose.example.yml index 00e1f5919a..de8a9787b1 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -1,7 +1,7 @@ version: '2' services: - drone-server: + woodpecker-server: build: context: . dockerfile: Dockerfile @@ -11,14 +11,14 @@ services: volumes: - /var/lib/drone:/var/lib/drone/ environment: - - DRONE_OPEN=true - - DRONE_ADMIN=laszlocph - - DRONE_HOST=${HOST} - - DRONE_GITHUB=true - - DRONE_GITHUB_CLIENT=${GITHUB_CLIENT} - - DRONE_GITHUB_SECRET=${GITHUB_SECRET} - - DRONE_SECRET=${DRONE_SECRET} - drone-agent: + - WOODPECKER_OPEN=true + - WOODPECKER_ADMIN=laszlocph + - WOODPECKER_HOST=${HOST} + - WOODPECKER_GITHUB=true + - WOODPECKER_GITHUB_CLIENT=${GITHUB_CLIENT} + - WOODPECKER_GITHUB_SECRET=${GITHUB_SECRET} + - WOODPECKER_SECRET=${WOODPECKER_SECRET} + woodpecker-agent: build: context: . dockerfile: Dockerfile.agent @@ -26,6 +26,6 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock environment: - - DRONE_SERVER=drone-server:9000 - - DRONE_SECRET=${DRONE_SECRET} - - DRONE_MAX_PROCS=2 \ No newline at end of file + - WOODPECKER_SERVER=drone-server:9000 + - WOODPECKER_SECRET=${WOODPECKER_SECRET} + - WOODPECKER_MAX_PROCS=2 From b900aa122696cf83c3ee1734719edb5582cc5f43 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 15 Aug 2021 16:26:40 +0800 Subject: [PATCH 2/3] update docker-compose version to 3 --- docker-compose.example.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.example.yml b/docker-compose.example.yml index de8a9787b1..b6df2fc229 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -1,4 +1,4 @@ -version: '2' +version: '3' services: woodpecker-server: From a7d5d73e42668f722df2bea040d9525a34a6a96a Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 15 Aug 2021 17:32:40 +0800 Subject: [PATCH 3/3] Update docker-compose.example.yml Co-authored-by: Anbraten --- docker-compose.example.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.example.yml b/docker-compose.example.yml index b6df2fc229..ac4720a53e 100644 --- a/docker-compose.example.yml +++ b/docker-compose.example.yml @@ -26,6 +26,6 @@ services: volumes: - /var/run/docker.sock:/var/run/docker.sock environment: - - WOODPECKER_SERVER=drone-server:9000 + - WOODPECKER_SERVER=woodpecker-server:9000 - WOODPECKER_SECRET=${WOODPECKER_SECRET} - WOODPECKER_MAX_PROCS=2