Secrets suck.

master
Jef Roosens 2021-12-29 22:53:53 +01:00
parent fe62145172
commit 7cf8126e1d
Signed by: Jef Roosens
GPG Key ID: 955C0660072F691F
1 changed files with 5 additions and 19 deletions

View File

@ -23,18 +23,14 @@ services:
- 'WOODPECKER_HOST=https://ci.rustybever.be' - 'WOODPECKER_HOST=https://ci.rustybever.be'
- 'WOODPECKER_DATABASE_DRIVER=postgres' - 'WOODPECKER_DATABASE_DRIVER=postgres'
- 'WOODPECKER_DATABASE_DATASOURCE=postgres://woodpecker:woodpecker@db:5432/woodpecker?sslmode=disable' - '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=true'
- 'WOODPECKER_GITEA_URL=https://git.rustybever.be' - 'WOODPECKER_GITEA_URL=https://git.rustybever.be'
- 'WOODPECKER_GITEA_CLIENT_FILE=/run/secrets/woodpecker_gitea_client_v2' - 'WOODPECKER_GITEA_CLIENT=${WOODPECKER_GITEA_CLIENT}'
- 'WOODPECKER_GITEA_SECRET_FILE=/run/secrets/woodpecker_gitea_secret' - 'WOODPECKER_GITEA_SECRET=${WOODPECKER_GITEA_SECRET}'
networks: networks:
- default - default
- public - public
secrets:
- woodpecker_agent_secret
- woodpecker_gitea_client_v2
- woodpecker_gitea_secret
db: db:
image: 'postgres:14.1-alpine' image: 'postgres:14.1-alpine'
@ -71,10 +67,8 @@ services:
- 'node.labels.class.ci==true' - 'node.labels.class.ci==true'
environment: environment:
- WOODPECKER_SERVER=app:9000 - 'WOODPECKER_SERVER=app:9000'
- WOODPECKER_AGENT_SECRET_FILE=/run/secrets/woodpecker_agent_secret - 'WOODPECKER_AGENT_SECRET=${WOODPECKER_AGENT_SECRET}'
secrets:
- woodpecker_agent_secret
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
@ -82,13 +76,5 @@ networks:
public: public:
external: true external: true
secrets:
woodpecker_agent_secret:
external: true
woodpecker_gitea_client_v2:
external: true
woodpecker_gitea_secret:
external: true
volumes: volumes:
db-data: db-data: