upgrade woodpecker and gitea images; remove unused services from docker-compose
This commit is contained in:
@ -15,10 +15,9 @@ services:
|
||||
- reversecaddyconfig:/config
|
||||
networks:
|
||||
- reverse
|
||||
- prometheus
|
||||
|
||||
woodpecker_server:
|
||||
image: woodpeckerci/woodpecker-server:v3.0.1-alpine
|
||||
image: woodpeckerci/woodpecker-server:v3.7.0-alpine
|
||||
volumes:
|
||||
- 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"
|
||||
@ -35,7 +34,7 @@ services:
|
||||
- woodpecker_gitea_secret
|
||||
|
||||
woodpecker_agent:
|
||||
image: woodpeckerci/woodpecker-agent:v3.0.1-alpine
|
||||
image: woodpeckerci/woodpecker-agent:v3.7.0-alpine
|
||||
volumes:
|
||||
- /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"
|
||||
@ -49,7 +48,7 @@ services:
|
||||
- woodpecker_agent_secret
|
||||
|
||||
gitea:
|
||||
image: codeberg.org/forgejo/forgejo:9
|
||||
image: docker.gitea.com/gitea:1.24.2
|
||||
environment:
|
||||
- USER_UID=1000
|
||||
- USER_GID=1000
|
||||
@ -66,48 +65,6 @@ services:
|
||||
networks:
|
||||
- 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:
|
||||
woodpecker_agent_secret:
|
||||
file: ./secrets/woodpecker_agent_secret
|
||||
@ -119,18 +76,12 @@ secrets:
|
||||
configs:
|
||||
caddy_config:
|
||||
file: ./Caddyfile
|
||||
prometheus_config:
|
||||
file: ./prometheus.yml
|
||||
|
||||
volumes:
|
||||
giteadata:
|
||||
letsencryptcerts:
|
||||
woodpeckerdata:
|
||||
reversecaddyconfig:
|
||||
reversecaddydata:
|
||||
external: true
|
||||
|
||||
networks:
|
||||
reverse:
|
||||
wireguard:
|
||||
prometheus:
|
||||
|
Reference in New Issue
Block a user