qpismont/infra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

switch secret to config + update service + adding deploy script

Browse source
This commit is contained in:
qpismont 2024-04-10 20:36:54 +02:00
parent ab5bba01ce
commit 9ad45435ff
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
deploy.sh Normal file
View file

@ -0,0 +1,3 @@
#!/bin/bash
docker --context prod stack deploy -c docker-compose.yml core

20
docker-compose.yml
View file

@ -7,18 +7,18 @@ services:
- "80:80" - "80:80"
- "443:443" - "443:443"
- "443:443/udp" - "443:443/udp"
command: caddy run --config /run/secrets/caddy_config --adapter caddyfile configs:
- source: caddy_config
target: /etc/caddy/Caddyfile
volumes: volumes:
- reversecaddydata:/data - reversecaddydata:/data
- reversecaddyconfig:/config - reversecaddyconfig:/config
networks: networks:
- reverse - reverse
- prometheus - prometheus
secrets:
- caddy_config
woodpecker_server: woodpecker_server:
image: woodpeckerci/woodpecker-server:v2.3.0-alpine image: woodpeckerci/woodpecker-server:v2.4.1-alpine
volumes: volumes:
- woodpeckerdata:/var/lib/woodpecker/ - woodpeckerdata:/var/lib/woodpecker/
entrypoint: /bin/sh -c "export WOODPECKER_GITEA_CLIENT=$$(cat /run/secrets/woodpecker_gitea_client) && export WOODPECKER_GITEA_SECRET=$$(cat /run/secrets/woodpecker_gitea_secret) && export WOODPECKER_AGENT_SECRET=$$(cat /run/secrets/woodpecker_agent_secret) && /bin/woodpecker-server" entrypoint: /bin/sh -c "export WOODPECKER_GITEA_CLIENT=$$(cat /run/secrets/woodpecker_gitea_client) && export WOODPECKER_GITEA_SECRET=$$(cat /run/secrets/woodpecker_gitea_secret) && export WOODPECKER_AGENT_SECRET=$$(cat /run/secrets/woodpecker_agent_secret) && /bin/woodpecker-server"
@ -35,7 +35,7 @@ services:
- woodpecker_gitea_secret - woodpecker_gitea_secret
woodpecker_agent: woodpecker_agent:
image: woodpeckerci/woodpecker-agent:v2.3.0-alpine image: woodpeckerci/woodpecker-agent:v2.4.1-alpine
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock - /var/run/docker.sock:/var/run/docker.sock
entrypoint: /bin/sh -c "export WOODPECKER_AGENT_SECRET=$$(cat /run/secrets/woodpecker_agent_secret) && /bin/woodpecker-agent" entrypoint: /bin/sh -c "export WOODPECKER_AGENT_SECRET=$$(cat /run/secrets/woodpecker_agent_secret) && /bin/woodpecker-agent"
@ -90,13 +90,13 @@ services:
- wireguard - wireguard
prometheus: prometheus:
image: prom/prometheus:v2.49.1 image: prom/prometheus:v2.51.2
command: --config.file=/run/secrets/prometheus_config --storage.tsdb.path=/prometheus --web.console.libraries=/usr/share/prometheus/console_libraries --web.console.templates=/usr/share/prometheus/consoles configs:
- source: prometheus_config
target: /etc/prometheus/prometheus.yml
networks: networks:
- wireguard - wireguard
- prometheus - prometheus
secrets:
- prometheus_config
cadvisor: cadvisor:
image: gcr.io/cadvisor/cadvisor:latest image: gcr.io/cadvisor/cadvisor:latest
@ -115,6 +115,8 @@ secrets:
file: ./secrets/woodpecker_gitea_secret file: ./secrets/woodpecker_gitea_secret
woodpecker_gitea_client: woodpecker_gitea_client:
file: ./secrets/woodpecker_gitea_client file: ./secrets/woodpecker_gitea_client
configs:
caddy_config: caddy_config:
file: ./Caddyfile file: ./Caddyfile
prometheus_config: prometheus_config: