Hopefully final initial fixes.
This commit is contained in:
parent
913797e814
commit
2aca9c7b55
@ -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 && 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
|
RUN apt-get update && apt-get install -y libvulkan1 mesa-vulkan-drivers vulkan-utils mesa-utils
|
||||||
|
|
||||||
ARG GID=1000
|
ARG G_ID=1000
|
||||||
ARG UID=1000
|
ARG U_ID=1000
|
||||||
|
|
||||||
RUN groupadd -f -g $GID ros
|
RUN groupadd -f -g ${G_ID} ros
|
||||||
RUN useradd -u $UID -g $GID -m ros
|
RUN useradd -u ${U_ID} -g ${G_ID} -m ros
|
||||||
|
|||||||
@ -7,8 +7,6 @@ services:
|
|||||||
context: ./build_ros
|
context: ./build_ros
|
||||||
args:
|
args:
|
||||||
ROS: galactic #Desired ROS version
|
ROS: galactic #Desired ROS version
|
||||||
UID: ${U_ID}
|
|
||||||
GID: ${G_ID}
|
|
||||||
volumes:
|
volumes:
|
||||||
- /tmp/.X11-unix:/tmp/.X11-unix:rw
|
- /tmp/.X11-unix:/tmp/.X11-unix:rw
|
||||||
- ./home:/home/ros
|
- ./home:/home/ros
|
||||||
@ -17,8 +15,6 @@ services:
|
|||||||
environment:
|
environment:
|
||||||
- DISPLAY=$DISPLAY
|
- DISPLAY=$DISPLAY
|
||||||
- XAUTHORITY=$XAUTHORITY
|
- XAUTHORITY=$XAUTHORITY
|
||||||
- U_ID=${U_ID}
|
|
||||||
- G_ID=${G_ID}
|
|
||||||
user: ${U_ID}:${G_ID}
|
user: ${U_ID}:${G_ID}
|
||||||
stdin_open: true
|
stdin_open: true
|
||||||
tty: true
|
tty: true
|
||||||
|
|||||||
4
start.sh
4
start.sh
@ -3,6 +3,10 @@
|
|||||||
mkdir $(dirname "$0")/home
|
mkdir $(dirname "$0")/home
|
||||||
|
|
||||||
sudo docker-compose down
|
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 build
|
||||||
sudo U_ID="$(id -u)" G_ID="$(id -g)" docker-compose up -d
|
sudo U_ID="$(id -u)" G_ID="$(id -g)" docker-compose up -d
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user