From b7cd9d2a609aaf7cd789db70f2aa06562cbb959d Mon Sep 17 00:00:00 2001 From: Dmitry Date: Wed, 27 May 2026 18:56:02 +0300 Subject: [PATCH] Update Caddy Dockerfile and docker-compose to use specific version and image reference --- mini-pc/caddy/Dockerfile | 6 +++--- mini-pc/caddy/docker-compose.yml | 2 +- mini-pc/v2rayA/docker-compose.yml | 10 ---------- 3 files changed, 4 insertions(+), 14 deletions(-) delete mode 100644 mini-pc/v2rayA/docker-compose.yml diff --git a/mini-pc/caddy/Dockerfile b/mini-pc/caddy/Dockerfile index c52c2eb..0faf15b 100644 --- a/mini-pc/caddy/Dockerfile +++ b/mini-pc/caddy/Dockerfile @@ -1,8 +1,8 @@ -FROM caddy:2-builder-alpine AS builder +FROM caddy:2.8.4-builder-alpine AS builder -RUN xcaddy build \ +RUN xcaddy build v2.8.4 \ --with github.com/dmtr636/caddy-dns-timeweb@v1.0.3 -FROM caddy:2-alpine +FROM caddy:2.8.4-alpine COPY --from=builder /usr/bin/caddy /usr/bin/caddy diff --git a/mini-pc/caddy/docker-compose.yml b/mini-pc/caddy/docker-compose.yml index 864904b..ca66beb 100644 --- a/mini-pc/caddy/docker-compose.yml +++ b/mini-pc/caddy/docker-compose.yml @@ -1,6 +1,6 @@ services: caddy: - build: . + image: git.ada-dev.ru/ada/caddy-timeweb:latest container_name: caddy env_file: - .env diff --git a/mini-pc/v2rayA/docker-compose.yml b/mini-pc/v2rayA/docker-compose.yml deleted file mode 100644 index b6818e6..0000000 --- a/mini-pc/v2rayA/docker-compose.yml +++ /dev/null @@ -1,10 +0,0 @@ -services: - v2raya: - image: mzz2017/v2raya:latest - container_name: v2raya - restart: unless-stopped - network_mode: host - environment: - V2RAYA_LOG_FILE: /tmp/v2raya.log - volumes: - - /opt/configs/v2raya:/etc/v2raya \ No newline at end of file