From 04e38223cdbdfe0d2d80e9ac1d3bb1346b166649 Mon Sep 17 00:00:00 2001
From: Kris Thielemans <k.thielemans@ucl.ac.uk>
Date: Fri, 21 May 2021 14:50:09 +0000
Subject: [PATCH] docker: fix UID/GID on Linux

docker-compose.yml` used the special variabled `UID` and `GROUPS`, but
it seems impossible to get `GROUPS` to be exported. Therefore, I switched
to using non-special env variables, but set those explicitly in `sirf-compose`.
---
 docker/docker-compose.yml | 4 ++--
 docker/sirf-compose       | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index e1418964..b282939e 100644
--- 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
index bf4ee0ce..ef52c88f 100755
--- 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 "$@"