upgrade Dockerfile to Debian 13; update woodpecker and gitea images; add wireguard and prometheus services to docker-compose

This commit is contained in:
2025-10-27 20:51:44 +00:00
parent f047317aa2
commit 43aba9bbe0
3 changed files with 63 additions and 8 deletions

View File

@@ -1,4 +1,4 @@
FROM debian:12
FROM debian:13
RUN apt update &&\
apt install ca-certificates curl git -y &&\

View File

@@ -1,3 +1,3 @@
#!/bin/bash
docker --context prod stack deploy -c docker-compose.yml core --with-registry-auth
DATETIME=$(date +%Y%m%d%H%M%S) docker --context prod stack deploy -c docker-compose.yml core --with-registry-auth

View File

@@ -15,9 +15,10 @@ services:
- reversecaddyconfig:/config
networks:
- reverse
- prometheus_network
woodpecker_server:
image: woodpeckerci/woodpecker-server:v3.7.0-alpine
image: woodpeckerci/woodpecker-server:v3.11.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"
@@ -34,7 +35,7 @@ services:
- woodpecker_gitea_secret
woodpecker_agent:
image: woodpeckerci/woodpecker-agent:v3.7.0-alpine
image: woodpeckerci/woodpecker-agent:v3.11.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"
@@ -48,7 +49,7 @@ services:
- woodpecker_agent_secret
gitea:
image: docker.gitea.com/gitea:1.24.2
image: docker.gitea.com/gitea:1.24.7
environment:
- USER_UID=1000
- USER_GID=1000
@@ -60,22 +61,71 @@ services:
networks:
- reverse
my_cv:
image: tintounn/portfolio:1.4
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:
- reverse
- wireguard_network
perses:
image: persesdev/perses:latest
networks:
- wireguard_network
- prometheus_network
prometheus:
image: prom/prometheus:v3.7.2
configs:
- source: prometheus_config
target: /etc/prometheus/prometheus.yml
networks:
- prometheus_network
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_network
secrets:
woodpecker_agent_secret:
name: woodpecker_agent_secret_${DATETIME}
file: ./secrets/woodpecker_agent_secret
woodpecker_gitea_secret:
name: woodpecker_gitea_secret_${DATETIME}
file: ./secrets/woodpecker_gitea_secret
woodpecker_gitea_client:
name: woodpecker_gitea_client_${DATETIME}
file: ./secrets/woodpecker_gitea_client
configs:
caddy_config:
name: caddy_config_${DATETIME}
file: ./Caddyfile
prometheus_config:
name: prometheus_config_${DATETIME}
file: ./prometheus.yml
volumes:
giteadata:
@@ -85,3 +135,8 @@ volumes:
networks:
reverse:
external: true
wireguard_network:
external: true
prometheus_network:
external: true