From 5e55b3f41556dce13797fd8068385ea693758a0d Mon Sep 17 00:00:00 2001
From: Jose Luis Rivero <jrivero@osrfoundation.org>
Date: Mon, 2 Sep 2024 17:54:49 +0200
Subject: [PATCH] Simplify Dockerfile and move to Ubuntu Noble

Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
---
 docker/gz-transport/Dockerfile | 61 ++++++++++------------------------
 1 file changed, 18 insertions(+), 43 deletions(-)

diff --git a/docker/gz-transport/Dockerfile b/docker/gz-transport/Dockerfile
index 45e3c390..4923b3e6 100644
--- a/docker/gz-transport/Dockerfile
+++ b/docker/gz-transport/Dockerfile
@@ -1,7 +1,8 @@
 # Ubuntu 22.04
-FROM ubuntu:jammy
+FROM ubuntu:noble
 
 ENV TZ=America/Los_Angeles
+ENV DEBIAN_FRONTEND=noninteractive
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 # Tools I find useful during development
@@ -31,62 +32,36 @@ RUN apt-get update \
         tzdata \
  && apt-get clean
 
-# Set USER and GROUP
-ARG USER=developer
-ARG GROUP=developer
-
-# Add a user with the same user_id as the user outside the container
-# Requires a docker build argument `user_id`.
-
-RUN curl -SsL https://github.com/boxboat/fixuid/releases/download/v0.4/fixuid-0.4-linux-amd64.tar.gz | tar -C /usr/local/bin -xzf - && \
-    chown root:root /usr/local/bin/fixuid && \
-    chmod 4755 /usr/local/bin/fixuid && \
-    mkdir -p /etc/fixuid && \
-    printf "user: $USER\ngroup: $GROUP\n" > /etc/fixuid/config.yml
-
-RUN addgroup --gid 1000 $USER && \
-    adduser --uid 1000 --ingroup $USER --home /home/$USER --shell /bin/sh --disabled-password --gecos "" $USER
-
-RUN adduser $USER sudo \
- && echo "$USER ALL=NOPASSWD: ALL" >> /etc/sudoers.d/$USER
-
-# Commands below run as the developer user.
-USER $USER:$GROUP
-
-# When running a container start in the developer's home folder.
-WORKDIR /home/$USER
-
-RUN export DEBIAN_FRONTEND=noninteractive \
- && sudo apt-get update \
- && sudo apt-get clean
-
 # Install gazebo dependencies
-RUN sudo /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' \
- && sudo /bin/sh -c 'wget http://packages.osrfoundation.org/gazebo.key -O - | sudo apt-key add -' \
- && sudo apt-get update \
- && sudo apt-get install -y \
+RUN /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/gazebo/ubuntu-stable `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-stable.list' \
+ && /bin/sh -c 'echo "deb [trusted=yes] http://packages.osrfoundation.org/gazebo/ubuntu-prerelease `lsb_release -cs` main" > /etc/apt/sources.list.d/gazebo-prerelease.list' \
+ && /bin/sh -c 'wget http://packages.osrfoundation.org/gazebo.key -O - | apt-key add -' \
+ && apt-get update \
+ && apt-get install -y \
     libgz-cmake4-dev \
     libgz-math8-dev \
     libgz-msgs11-dev \
     libgz-utils3-cli-dev \
- && sudo apt-get clean
+ && apt-get clean
 
+USER ubuntu
+WORKDIR /tmp
 # Gazebo transport
-RUN git clone https://github.com/gazebosim/gz-transport.git -b gz-transport14 \
- && cd gz-transport \
+RUN git clone https://github.com/gazebosim/gz-transport.git -b gz-transport14
+RUN cd gz-transport \
  && mkdir build \
  && cd build \
- && cmake .. -DCMAKE_INSTALL_PREFIX=/usr \
- && sudo make -j4 install \
- && cd ../..
+ && cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/gz-transport \
+ && make -j4 install
 
 # Gazebo transport examples
 RUN cd gz-transport/example \
  && mkdir build \
  && cd build \
- && cmake .. \
- && make -j4 \
- && cd ../..
+ && cmake .. -DCMAKE_INSTALL_PREFIX=/tmp/gz-transport \
+ && make -j4
+
+WORKDIR /tmp/gz-transport/example/build
 
 # Customize your image here.
 # E.g.: