From 0d8408f446a481386e741cf9461d6ca1c6d4a600 Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Sat, 24 Apr 2021 00:45:09 +0200 Subject: [PATCH] Updated woodpecker config --- woodpecker/.env.example | 2 ++ woodpecker/docker-compose.yml | 10 ++-------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/woodpecker/.env.example b/woodpecker/.env.example index d87b716..0bc284b 100644 --- a/woodpecker/.env.example +++ b/woodpecker/.env.example @@ -2,6 +2,8 @@ DRONE_OPEN=true # Drone needs to know its own location DRONE_HOST= +# The same, but without the https in front of it +DRONE_SERVER= # Shared secret to communicate with agents DRONE_SECRET= diff --git a/woodpecker/docker-compose.yml b/woodpecker/docker-compose.yml index ae9c317..22010ca 100644 --- a/woodpecker/docker-compose.yml +++ b/woodpecker/docker-compose.yml @@ -10,12 +10,6 @@ services: depends_on: db: condition: 'service_healthy' - healthcheck: - test: 'curl -f http://localhost:8000/ || exit 1' - interval: '30s' - retries: 3 - timeout: '5s' - start_period: '10s' env_file: - '.env' @@ -50,7 +44,7 @@ services: # We can deploy more agents by using the scale command # Each agent can do one parallel build by default agent: - image: 'laszlocloud/woodpecker-server:v0.12.0' + image: 'laszlocloud/woodpecker-agent:v0.12.0' restart: 'always' command: 'agent' @@ -59,7 +53,7 @@ services: condition: 'service_healthy' environment: - - 'DRONE_SERVER=${DRONE_HOST}' + - 'DRONE_SERVER=${DRONE_SERVER}' - 'DRONE_SECRET=${DRONE_SECRET}' volumes: - '/var/run/docker.sock:/var/run/docker.sock'