This is an automated email from the ASF dual-hosted git repository.

bneradt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/trafficserver-ci.git


The following commit(s) were added to refs/heads/main by this push:
     new 584118a  Support legacy github-mirror Compose (#446)
584118a is described below

commit 584118a919458b1fa12591d18feef38cfb21f784
Author: Brian Neradt <[email protected]>
AuthorDate: Mon Jun 15 12:00:37 2026 -0500

    Support legacy github-mirror Compose (#446)
    
    The controller still uses legacy docker-compose 1.25, which rejects Compose
    files without an explicit version and does not support default-value
    interpolation in bind mount strings. The new /opt/github-mirror installer 
hit
    that incompatibility during rollout.
    
    This keeps the Compose file compatible with the controller by restoring the
    version field and relying on the installer-generated .env file for 
MIRROR_ROOT.
    This also excludes the installed webhook secret from future Docker build
    contexts.
---
 github-mirror/.dockerignore      | 2 ++
 github-mirror/docker-compose.yml | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/github-mirror/.dockerignore b/github-mirror/.dockerignore
new file mode 100644
index 0000000..6076e85
--- /dev/null
+++ b/github-mirror/.dockerignore
@@ -0,0 +1,2 @@
+.env
+config/github-mirror-webhook.env
diff --git a/github-mirror/docker-compose.yml b/github-mirror/docker-compose.yml
index b08c7d8..224dd86 100644
--- a/github-mirror/docker-compose.yml
+++ b/github-mirror/docker-compose.yml
@@ -1,3 +1,5 @@
+version: '3'
+
 services:
   github-mirror:
     build:
@@ -10,7 +12,7 @@ services:
     ports:
       - "127.0.0.1:9419:9419"
     volumes:
-      - "${MIRROR_ROOT:-/home/mirror}:/home/mirror:rw"
+      - "${MIRROR_ROOT}:/home/mirror:rw"
       - ".:/opt/github-mirror:ro"
     env_file:
       - ./config/github-mirror-webhook.env
@@ -31,14 +33,14 @@ services:
     ports:
       - "127.0.0.1:9417:80"
     volumes:
-      - "${MIRROR_ROOT:-/home/mirror}:/usr/local/apache2/mirror:ro"
+      - "${MIRROR_ROOT}:/usr/local/apache2/mirror:ro"
       - /var/log/github-mirror-smart-http:/usr/local/apache2/logs
 
   github-mirror-fallback:
     image: trafficserver/github-mirror-webhook:latest
     user: "${MIRROR_UID}:${MIRROR_GID}"
     volumes:
-      - "${MIRROR_ROOT:-/home/mirror}:/home/mirror:rw"
+      - "${MIRROR_ROOT}:/home/mirror:rw"
       - ".:/opt/github-mirror:ro"
     environment:
       MIRROR_ROOT: "/home/mirror"

Reply via email to