Update Docker Development Image (#2409)

Update

Author: rishiso

Dockerfile.dev

@@ -1,5 +1,5 @@
 # Use the official Ubuntu 22.04 image
-FROM osrf/ros:humble-desktop-full
+FROM ubuntu:22.04
 
 # Set environment variables for non-interactive installation
 ENV DEBIAN_FRONTEND=noninteractive
@@ -10,7 +10,6 @@ ENV DISPLAY=:1
 ARG TARGETARCH
 ENV TARGETARCH=${TARGETARCH}
 
-
 # Update the package list and install necessary packages, including the missing ones
 RUN apt-get update && \
     apt-get install -y \
@@ -52,13 +51,26 @@ RUN mkdir -p /root/.vnc && \
 ENV TZ=America/New_York
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
+# Clone RoboJackets RoboCup software
+RUN git clone https://github.com/RoboJackets/robocup-software.git /root/robocup-software
+
+# Install dependencies
+RUN cd /root/robocup-software && \
+    ./util/ubuntu-setup -y || { echo 'ubuntu-setup script failed' ; exit 1; }
+
 # Clone and build ER-Force’s simulator
 RUN git clone https://github.com/robotics-erlangen/framework.git /root/framework && \
     cd /root/framework && \
     mkdir build && cd build && \
     cmake .. && \
     make simulator-cli
 
+# Build our stack
+RUN bash -c "source /opt/ros/humble/setup.bash && \
+    cd /root/robocup-software && \
+    colcon build --parallel-workers 1 --executor sequential && \
+    source install/setup.bash"
+
 # Clone, build ER-Force's autoref
 RUN git clone https://github.com/robotics-erlangen/autoref.git /root/autoref && \
     cd /root/autoref && \
@@ -76,13 +88,6 @@ RUN cd /root && \
     fi && \
     chmod +x ssl-game-controller_v3.12.3_linux_*
 
-# Install Robocup Dependencies
-RUN mkdir -p /util
-COPY ./util/ubuntu-setup /ubuntu-setup
-COPY ./util/ubuntu-packages.txt /util/ubuntu-packages.txt
-COPY ./util/requirements3.txt /util/requirements3.txt
-RUN /ubuntu-setup -y || { echo 'ubuntu-setup script failed' ; exit 1; }
-
 # Expose the VNC, noVNC, and external ref ports
 EXPOSE 5901 6080 8081
 

docs/source/installation.rst

@@ -33,7 +33,7 @@ install all required dependencies:
 
 .. code-block:: bash
 
-    cd robocup-software && ./util/ubuntu-setup && ./util/git-setup
+    cd robocup-software && ./util/ubuntu-setup
 
 To simulate the vision data we'd get from a real field camera setup, we'll use
 ER-Force's simulator. For that, clone their repo, and ``cd`` into it. Note, this should
@@ -162,8 +162,6 @@ Once you have Docker installed, please follow the steps for installing and using
 image at `DockerHub
 <https://hub.docker.com/r/robojackets/robocup-software-dev>`_.
 
-Once you're done, follow the instructions on :ref:`building the stack <building_the_stack>`.
-
 
 Shortcuts
 ---------