Merge pull request #545 from KrisThielemans/docker_uidgid

docker: fix UID/GID on Linux fixes #464
SyneRBI · May 21, 2021 · baec8f7 · baec8f7
2 parents a24544f + 04e3822
commit baec8f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -6,8 +6,8 @@ services:
   environment:
    # mainUser: ${USER:-sirfuser}
    mainUser: sirfuser
-   GROUP_ID: ${GROUPS:-1000}
-   USER_ID: ${UID:-1000}
+   GROUP_ID: ${GROUP_ID:-1000}
+   USER_ID: ${USER_ID:-1000}
   build:
    context: .
    target: sirf

diff --git a/docker/sirf-compose b/docker/sirf-compose
@@ -1,3 +1,5 @@
 #!/usr/bin/env bash
 cd "$(dirname $0)"
+export GROUP_ID=$(id -g)
+export USER_ID=$(id -u)
 docker-compose -f docker-compose.yml -f docker-compose.nix.yml "$@"