From 2aca9c7b555cb5ce4219463a71b5c11b875b17ea Mon Sep 17 00:00:00 2001
From: yenon <bhogm4@gmail.com>
Date: Mon, 5 Sep 2022 11:10:23 +0200
Subject: [PATCH] Hopefully final initial fixes.

---
 build_ros/Dockerfile | 8 ++++----
 docker-compose.yaml  | 4 ----
 start.sh             | 4 ++++
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build_ros/Dockerfile b/build_ros/Dockerfile
index c8731af..dd97d60 100755
--- a/build_ros/Dockerfile
+++ b/build_ros/Dockerfile
@@ -4,8 +4,8 @@ RUN apt-get update && apt-get install -y ros-galactic-ros-ign-gazebo
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y xserver-xorg-video-all libgl1-mesa-glx libgl1-mesa-dri libglvnd0 libgl1 libglx0 libegl1 libxext6 libx11-6
 RUN apt-get update && apt-get install -y libvulkan1 mesa-vulkan-drivers vulkan-utils mesa-utils
 
-ARG GID=1000
-ARG UID=1000
+ARG G_ID=1000
+ARG U_ID=1000
 
-RUN groupadd -f -g $GID ros
-RUN useradd -u $UID -g $GID -m ros
+RUN groupadd -f -g ${G_ID} ros
+RUN useradd -u ${U_ID} -g ${G_ID} -m ros
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 9b69ad2..f74c5dc 100755
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -7,8 +7,6 @@ services:
       context: ./build_ros
       args:
         ROS: galactic           #Desired ROS version
-        UID: ${U_ID}
-        GID: ${G_ID}
     volumes:
       - /tmp/.X11-unix:/tmp/.X11-unix:rw
       - ./home:/home/ros
@@ -17,8 +15,6 @@ services:
     environment:
       - DISPLAY=$DISPLAY
       - XAUTHORITY=$XAUTHORITY
-      - U_ID=${U_ID}
-      - G_ID=${G_ID}
     user: ${U_ID}:${G_ID}
     stdin_open: true
     tty: true
diff --git a/start.sh b/start.sh
index 6a1490b..d49d98b 100755
--- a/start.sh
+++ b/start.sh
@@ -3,6 +3,10 @@
 mkdir $(dirname "$0")/home
 
 sudo docker-compose down
+
+echo U_ID="$(id -u)" > $(dirname "$0")/.env
+echo G_ID="$(id -g)" >> $(dirname "$0")/.env
+
 sudo U_ID="$(id -u)" G_ID="$(id -g)" docker-compose build
 sudo U_ID="$(id -u)" G_ID="$(id -g)" docker-compose up -d