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

upgrade woodpecker and gitea images; remove unused services from docker-compose

Browse Source
This commit is contained in:
qpismont
2025-06-23 18:30:51 +00:00
parent 062398ce28
commit f047317aa2
1 changed files with 3 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
docker-compose.yml
View File

@ -15,10 +15,9 @@ services:
- reversecaddyconfig:/config - reversecaddyconfig:/config
networks: networks:
- reverse - reverse
- prometheus
woodpecker_server: woodpecker_server:
image: woodpeckerci/woodpecker-server:v3.0.1-alpine image: woodpeckerci/woodpecker-server:v3.7.0-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 +34,7 @@ services:
- woodpecker_gitea_secret - woodpecker_gitea_secret
woodpecker_agent: woodpecker_agent:
image: woodpeckerci/woodpecker-agent:v3.0.1-alpine image: woodpeckerci/woodpecker-agent:v3.7.0-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"
@ -49,7 +48,7 @@ services:
- woodpecker_agent_secret - woodpecker_agent_secret
gitea: gitea:
image: codeberg.org/forgejo/forgejo:9 image: docker.gitea.com/gitea:1.24.2
environment: environment:
- USER_UID=1000 - USER_UID=1000
- USER_GID=1000 - USER_GID=1000
@ -66,48 +65,6 @@ services:
networks: networks:
- reverse - reverse
wireguard_server:
image: linuxserver/wireguard
cap_add:
- NET_ADMIN
- SYS_MODULE
environment:
PUID: 1000
PGID: 1000
TZ: Europe/Paris
SERVEURURL: wireguard.qpismont.fr
SERVERPORT: 51820
PEERS: 1
PEERDNS: auto
volumes:
- /home/user/wireguard-config:/config
- /lib/modules:/lib/modules
ports:
- 51820:51820/udp
sysctls:
- net.ipv4.conf.all.src_valid_mark=1
networks:
- wireguard
prometheus:
image: prom/prometheus:v2.55.1
configs:
- source: prometheus_config
target: /etc/prometheus/prometheus.yml
networks:
- wireguard
- prometheus
cadvisor:
image: gcr.io/cadvisor/cadvisor:latest
volumes:
- /:/rootfs:ro
- /var/run:/var/run:rw
- /sys:/sys:ro
- /var/lib/docker/:/var/lib/docker:ro
networks:
- prometheus
secrets: secrets:
woodpecker_agent_secret: woodpecker_agent_secret:
file: ./secrets/woodpecker_agent_secret file: ./secrets/woodpecker_agent_secret
@ -119,18 +76,12 @@ secrets:
configs: configs:
caddy_config: caddy_config:
file: ./Caddyfile file: ./Caddyfile
prometheus_config:
file: ./prometheus.yml
volumes: volumes:
giteadata: giteadata:
letsencryptcerts:
woodpeckerdata: woodpeckerdata:
reversecaddyconfig: reversecaddyconfig:
reversecaddydata: reversecaddydata:
external: true
networks: networks:
reverse: reverse:
wireguard:
prometheus: