From 51b8776776e5a6d7b748bd03eec48bed80698d29 Mon Sep 17 00:00:00 2001
From: Flaminel <flm.marius@gmail.com>
Date: Tue, 20 Oct 2026 15:54:53 +0300
Subject: [PATCH] Fix e2e containers running as a different UID (#858)

---
 .github/workflows/e2e.yml  |  5 +++++
 e2e/docker-compose.e2e.yml | 32 ++++++++++++++++----------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index cc79cc9e..e39850a1 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -138,6 +138,11 @@ jobs:
           ref: ${{ inputs.ref || github.ref }}
           persist-credentials: false
 
+      - name: Match container uid/gid to the runner user
+        run: |
+          echo "E2E_PUID=$(id -u)" >> "$GITHUB_ENV"
+          echo "E2E_PGID=$(id -g)" >> "$GITHUB_ENV"
+
       - name: Start the stack
         working-directory: e2e
         run: make ${{ matrix.suite.stack-target }}
diff --git a/e2e/docker-compose.e2e.yml b/e2e/docker-compose.e2e.yml
index 7002699d..d0d76381 100644
--- a/e2e/docker-compose.e2e.yml
+++ b/e2e/docker-compose.e2e.yml
@@ -134,8 +134,8 @@ services:
     image: lscr.io/linuxserver/qbittorrent:5.2.3
     network_mode: host
     environment:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "${E2E_PUID:-1000}"
+      PGID: "${E2E_PGID:-1000}"
       TZ: "UTC"
       WEBUI_PORT: "8090"
       TORRENTING_PORT: "6881"
@@ -153,8 +153,8 @@ services:
     image: lscr.io/linuxserver/transmission:4.0.6
     network_mode: host
     environment:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "${E2E_PUID:-1000}"
+      PGID: "${E2E_PGID:-1000}"
       TZ: "UTC"
       USER: "transmission"
       PASS: "transmission"
@@ -173,8 +173,8 @@ services:
     image: lscr.io/linuxserver/deluge:2.1.1
     network_mode: host
     environment:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "${E2E_PUID:-1000}"
+      PGID: "${E2E_PGID:-1000}"
       TZ: "UTC"
       DELUGE_LOGLEVEL: "info"
     volumes:
@@ -219,8 +219,8 @@ services:
     image: lscr.io/linuxserver/sonarr:4.0.19
     network_mode: host
     environment:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "${E2E_PUID:-1000}"
+      PGID: "${E2E_PGID:-1000}"
       TZ: "UTC"
     volumes:
       - ./test-data/sonarr-config:/config
@@ -237,8 +237,8 @@ services:
     image: lscr.io/linuxserver/radarr:6.3.0
     network_mode: host
     environment:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "${E2E_PUID:-1000}"
+      PGID: "${E2E_PGID:-1000}"
       TZ: "UTC"
     volumes:
       - ./test-data/radarr-config:/config
@@ -259,8 +259,8 @@ services:
     image: lscr.io/linuxserver/lazylibrarian:276d79c1-ls333
     network_mode: host
     environment:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "${E2E_PUID:-1000}"
+      PGID: "${E2E_PGID:-1000}"
       TZ: "UTC"
     volumes:
       - ./test-data/lazylibrarian-config:/config
@@ -292,8 +292,8 @@ services:
     image: lscr.io/linuxserver/sabnzbd:5.1.3-ls275
     network_mode: host
     environment:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "${E2E_PUID:-1000}"
+      PGID: "${E2E_PGID:-1000}"
       TZ: "UTC"
     volumes:
       - ./test-data/sabnzbd-config:/config
@@ -313,8 +313,8 @@ services:
     ports:
       - "8088:80"
     environment:
-      PUID: "1000"
-      PGID: "1000"
+      PUID: "${E2E_PUID:-1000}"
+      PGID: "${E2E_PGID:-1000}"
       TZ: "UTC"
     volumes:
       - ./test-data/rutorrent-config:/config