From 7cf8126e1d4710d96cf79738f3f66f5100d5662e Mon Sep 17 00:00:00 2001 From: Jef Roosens Date: Wed, 29 Dec 2021 22:53:53 +0100 Subject: [PATCH] Secrets suck. --- stacks/woodpecker.yml | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/stacks/woodpecker.yml b/stacks/woodpecker.yml index f412b40..ddb0d36 100644 --- a/stacks/woodpecker.yml +++ b/stacks/woodpecker.yml @@ -23,18 +23,14 @@ services: - 'WOODPECKER_HOST=https://ci.rustybever.be' - 'WOODPECKER_DATABASE_DRIVER=postgres' - 'WOODPECKER_DATABASE_DATASOURCE=postgres://woodpecker:woodpecker@db:5432/woodpecker?sslmode=disable' - - 'WOODPECKER_AGENT_SECRET_FILE=/run/secrets/woodpecker_agent_secret' + - 'WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET}' - 'WOODPECKER_GITEA=true' - 'WOODPECKER_GITEA_URL=https://git.rustybever.be' - - 'WOODPECKER_GITEA_CLIENT_FILE=/run/secrets/woodpecker_gitea_client_v2' - - 'WOODPECKER_GITEA_SECRET_FILE=/run/secrets/woodpecker_gitea_secret' + - 'WOODPECKER_GITEA_CLIENT=${WOODPECKER_GITEA_CLIENT}' + - 'WOODPECKER_GITEA_SECRET=${WOODPECKER_GITEA_SECRET}' networks: - default - public - secrets: - - woodpecker_agent_secret - - woodpecker_gitea_client_v2 - - woodpecker_gitea_secret db: image: 'postgres:14.1-alpine' @@ -71,10 +67,8 @@ services: - 'node.labels.class.ci==true' environment: - - WOODPECKER_SERVER=app:9000 - - WOODPECKER_AGENT_SECRET_FILE=/run/secrets/woodpecker_agent_secret - secrets: - - woodpecker_agent_secret + - 'WOODPECKER_SERVER=app:9000' + - 'WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET}' volumes: - /var/run/docker.sock:/var/run/docker.sock @@ -82,13 +76,5 @@ networks: public: external: true -secrets: - woodpecker_agent_secret: - external: true - woodpecker_gitea_client_v2: - external: true - woodpecker_gitea_secret: - external: true - volumes: db-data: