From 24249a1e74a17a19f0eebd78af791f076828294e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Wed, 24 Nov 2021 08:57:49 +0100
Subject: [PATCH] Fixing CI

---
 .github/workflows/end_to_end_tests.yml | 2 +-
 docker-compose.testcafe.yml            | 2 +-
 tests/README.md                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/end_to_end_tests.yml b/.github/workflows/end_to_end_tests.yml
index e5cd7d86..fba7bf46 100644
--- a/.github/workflows/end_to_end_tests.yml
+++ b/.github/workflows/end_to_end_tests.yml
@@ -30,4 +30,4 @@ jobs:
         run: (docker-compose -f docker-compose.testcafe.yml pull &) && docker-compose logs -f --tail=0 front | grep -m 1 "Compiled successfully"
 
       - name: "Run tests"
-        run: docker-compose -f docker-compose.testcafe.yml up --exit-code-from testcafe
+        run: DOCKER_UID=$(id -u) DOCKER_UID=$(id -g) docker-compose -f docker-compose.testcafe.yml up --exit-code-from testcafe
diff --git a/docker-compose.testcafe.yml b/docker-compose.testcafe.yml
index 705b8e0f..631458dd 100644
--- a/docker-compose.testcafe.yml
+++ b/docker-compose.testcafe.yml
@@ -8,7 +8,7 @@ services:
     volumes:
       - ./tests:/tests
       - ./maps:/maps
-    user: "${UID}:${GID}"
+    user: "${DOCKER_UID}:${DOCKER_GID}"
 
   #  security_opt:
   #    - seccomp:unconfined
diff --git a/tests/README.md b/tests/README.md
index 86388ff1..4c47da50 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -12,7 +12,7 @@ $ npm test
 Alternatively, you can use docker-compose to run the tests:
 
 ```console
-$ UID=$(id -u) GID=$(id -g) docker-compose -f docker-compose.testcafe.yml up --exit-code-from testcafe
+$ DOCKER_UID=$(id -u) DOCKER_GID=$(id -g) docker-compose -f docker-compose.testcafe.yml up --exit-code-from testcafe
 ```
 
 Note: by default, tests are running in Chrome locally and in Chromium in the Docker image.