From 8e0de633d9f2dbe39384995a4c1d656cf42d6513 Mon Sep 17 00:00:00 2001 From: qpismont Date: Sat, 13 Dec 2025 11:57:29 +0000 Subject: [PATCH] update devcontainer and docker-compose configurations; upgrade images and fix network references --- .devcontainer/devcontainer.json | 3 ++- docker-compose.yml | 39 +++++++++------------------------ 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 671abf5..c1d1205 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -6,5 +6,6 @@ ], "build": { "dockerfile": "Dockerfile" - } + }, + "postAttachCommand": "docker context create prod --docker \"host=ssh://user@62.210.212.10\"" } \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 684d647..4a6d9f3 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: "3" services: reverse_caddy: - image: caddy:2-alpine + image: caddy:2.11-alpine ports: - "80:80" - "443:443" @@ -14,11 +14,11 @@ services: - reversecaddydata:/data - reversecaddyconfig:/config networks: - - reverse + - reverse_network - prometheus_network woodpecker_server: - image: woodpeckerci/woodpecker-server:v3.11.0-alpine + image: woodpeckerci/woodpecker-server:v3.12.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" @@ -28,14 +28,14 @@ services: WOODPECKER_GITEA: "true" WOODPECKER_GITEA_URL: https://gitea.qpismont.fr networks: - - reverse + - reverse_network secrets: - woodpecker_agent_secret - woodpecker_gitea_client - woodpecker_gitea_secret woodpecker_agent: - image: woodpeckerci/woodpecker-agent:v3.11.0-alpine + image: woodpeckerci/woodpecker-agent:v3.12.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" @@ -44,12 +44,12 @@ services: WOODPECKER_MAX_WORKFLOWS: 1 WOODPECKER_LIMIT_CPU_SET: 1 networks: - - reverse + - reverse_network secrets: - woodpecker_agent_secret gitea: - image: docker.gitea.com/gitea:1.24.7 + image: docker.gitea.com/gitea:1.25.2 environment: - USER_UID=1000 - USER_GID=1000 @@ -59,7 +59,7 @@ services: - /etc/timezone:/etc/timezone:ro - /etc/localtime:/etc/localtime:ro networks: - - reverse + - reverse_network wireguard_server: image: linuxserver/wireguard @@ -91,7 +91,7 @@ services: - prometheus_network prometheus: - image: prom/prometheus:v3.7.2 + image: prom/prometheus:v3.8.0 configs: - source: prometheus_config target: /etc/prometheus/prometheus.yml @@ -108,25 +108,6 @@ services: networks: - prometheus_network - backup: - image: offen/docker-volume-backup:latest - environment: - BACKUP_CRON_EXPRESSION: "0 4 * * *" - BACKUP_RETENTION_DAYS: "14" - BACKUP_COMPRESSION: "gz" - BACKUP_FILENAME: "backup-infra-%Y-%m-%dT%H-%M-%S.tar.gz" - - BACKUP_BACKEND: "rclone" - RCLONE_REMOTE_NAME: "ftp" - RCLONE_REMOTE_PATH: "/backups/infra" - secrets: - - backup_ftp_config - entrypoint: /bin/sh -c "mkdir -p /root/.config/rclone && cat /run/secrets/backup_ftp_config > /root/.config/rclone/rclone.conf && /usr/bin/backup -foreground" - volumes: - - /var/run/docker.sock:/var/run/docker.sock:ro - - giteadata:/backup/gitea:ro - - backuptemp:/tmp/backup - secrets: woodpecker_agent_secret: name: woodpecker_agent_secret_${DATETIME} @@ -157,7 +138,7 @@ volumes: backuptemp: networks: - reverse: + reverse_network: external: true wireguard_network: external: true