diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 0000000..c5c28e7 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +docker --context prod stack deploy -c docker-compose.yml core \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 0f89597..3b7a2a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,18 +7,18 @@ services: - "80:80" - "443:443" - "443:443/udp" - command: caddy run --config /run/secrets/caddy_config --adapter caddyfile + configs: + - source: caddy_config + target: /etc/caddy/Caddyfile volumes: - reversecaddydata:/data - reversecaddyconfig:/config networks: - reverse - prometheus - secrets: - - caddy_config woodpecker_server: - image: woodpeckerci/woodpecker-server:v2.3.0-alpine + image: woodpeckerci/woodpecker-server:v2.4.1-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 +35,7 @@ services: - woodpecker_gitea_secret woodpecker_agent: - image: woodpeckerci/woodpecker-agent:v2.3.0-alpine + image: woodpeckerci/woodpecker-agent:v2.4.1-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" @@ -90,13 +90,13 @@ services: - wireguard prometheus: - image: prom/prometheus:v2.49.1 - 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 + image: prom/prometheus:v2.51.2 + configs: + - source: prometheus_config + target: /etc/prometheus/prometheus.yml networks: - wireguard - prometheus - secrets: - - prometheus_config cadvisor: image: gcr.io/cadvisor/cadvisor:latest @@ -115,6 +115,8 @@ secrets: file: ./secrets/woodpecker_gitea_secret woodpecker_gitea_client: file: ./secrets/woodpecker_gitea_client + +configs: caddy_config: file: ./Caddyfile prometheus_config: