fixed paths

Author: h3ct0r

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
     "remoteUser": "ubuntu",
     "service": "ros1",
     "dockerComposeFile": [
-        "../compose_macos_host.yaml"
+        "../compose_linux_host.yaml"
     ],
     "waitFor": "postCreateCommand",
     "workspaceFolder": "/home/ubuntu",

docker/Dockerfile.amd64

@@ -10,4 +10,4 @@ RUN  curl -fOL https://github.com/coder/code-server/releases/download/v4.104.2/c
     rm code-server_4.104.2_amd64.deb
 
 INCLUDE+ docker/Dockerfile.user.common
-INCLUDE+ docker/Dockerfile.user.common
+INCLUDE+ docker/Dockerfile.entrypoint.common

docker/Dockerfile.entrypoint.common

@@ -1,2 +1,4 @@
-ENTRYPOINT [ "docker/entrypoint.sh" ]
+RUN sudo chown -R ubuntu:ubuntu /home/ubuntu
+
+ENTRYPOINT [ "/entrypoint.sh" ]
 CMD [ "sudo", "-E", "/usr/bin/supervisord", "-c", "/etc/supervisor/supervisord.conf"]

docker/Dockerfile.root.common

@@ -24,23 +24,17 @@ RUN usermod -aG sudo ubuntu
 RUN apt-get install -y \
     xfce4 \
     xfce4-goodies \
+    tigervnc-standalone-server \
+    tigervnc-common \
+    gosu \
     supervisor
 
-# Install additonal packages
+# Install required additonal packages
 RUN apt-get install -y \
+    less \
     python3-pip \
     python-is-python3 \
-    python3-catkin-tools \
-    jq \
-    ssh \
-    neovim \
-    git \
     build-essential \
-    git python3-colcon-common-extensions \
-    python3-colcon-mixin \
-    python3-rosdep \
-    python3-vcstool \
-    wget \
     nano \
     vim \
     iputils-ping \
@@ -49,53 +43,28 @@ RUN apt-get install -y \
     mesa-utils \
     libompl-dev \
     ompl-demos \
-    terminator \
     tmux \
     dbus-x11 \
     tree \
-    curl \
-    nmap \
-    tigervnc-standalone-server \
-    tigervnc-common \
-    supervisor \
     wget \
     curl \
-    gosu \
     git \
-    sudo \
-    python3-pip \
-    tini \
     lsb-release \
     locales \
-    bash-completion \
     tzdata \
     terminator \
-    openssh-server
-
-# Install OpenSSH Server and necessary tools
-# Set root password (replace 'your_password' with a strong password)
-# Allow root login (optional, but simplifies initial setup)
-RUN mkdir /var/run/sshd
-RUN echo 'ubuntu:ubuntu' | chpasswd
-RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-
-# noVNC and Websockify
-RUN git clone https://github.com/AtsushiSaito/noVNC.git -b add_clipboard_support /usr/lib/novnc
-RUN pip install --no-cache-dir git+https://github.com/novnc/websockify.git@v0.10.0
-RUN ln -s /usr/lib/novnc/vnc.html /usr/lib/novnc/index.html
-
-# Set remote resize function enabled by default
-RUN sed -i "s/UI.initSetting('resize', 'off');/UI.initSetting('resize', 'remote');/g" /usr/lib/novnc/app/ui.js
-
-# Disable crash report
-RUN sed -i 's/enabled=1/enabled=0/g' /etc/default/apport 
+    ssh \
+    openssh-server \
+    libsecret-1-dev \
+    gnupg2 \
+    firefox
 
 # install ros packages (fix broken key)
 RUN sh -c 'echo "deb http://packages.ros.org/ros/ubuntu `lsb_release -sc` main" \
     > /etc/apt/sources.list.d/ros-latest.list' && \
     wget https://raw.githubusercontent.com/ros/rosdistro/master/ros.key -O - | sudo apt-key add - && \
     apt update && \
-    apt install -y python3-catkin-tools \
+    apt install -y \
     ros-noetic-desktop-full \
     ros-noetic-velodyne \
     ros-noetic-velodyne-description \
@@ -109,34 +78,47 @@ RUN sh -c 'echo "deb http://packages.ros.org/ros/ubuntu `lsb_release -sc` main"
     ros-noetic-realsense2-camera \
     ros-noetic-realsense2-description \
     ros-noetic-gazebo-plugins \
-    python3-rosinstall \
-    python3-rosinstall-generator \
-    python3-wstool \
     python3-catkin-tools \
-    python3-osrf-pycommon \
-    python3-argcomplete \
-    python3-rosdep python3-vcstool \ 
-    gnupg2 lsb-release \
+    python3-rosdep \
+    python3-vcstool \
     python3-rosinstall \
     python3-rosinstall-generator \
     python3-wstool \
-    python3-catkin-tools \
     python3-osrf-pycommon \
-    python3-argcomplete \
-    python3-rosdep python3-vcstool
+    python3-argcomplete
 
-# install depending packages
-RUN apt-get install -y bash-completion \
-    less \
-    wget \
-    language-pack-en \
-    vim-tiny \
-    iputils-ping \
-    net-tools \
-    imagemagick \
-    python-dev \
-    libsecret-1-dev \
-    firefox
+# copy files from host to container
+COPY configs/supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+COPY configs/supervisord/custom_programs.conf /etc/supervisor/conf.d/custom_programs.conf
+COPY configs/supervisord/code_server.conf /etc/supervisor/conf.d/code_server.conf
+COPY configs/xfce4_defaults /usr/share/xfwm4/defaults
+
+COPY docker/entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+COPY .devcontainer/onCreate.sh /onCreate.sh
+RUN chmod +x /onCreate.sh
+COPY .devcontainer/postCreate.sh /postCreate.sh
+RUN chmod +x /postCreate.sh
+COPY .devcontainer/postAttach.sh /postAttach.sh
+RUN chmod +x /postAttach.sh
+
+# Install OpenSSH Server and necessary tools
+# Set root password (replace 'your_password' with a strong password)
+# Allow root login (optional, but simplifies initial setup)
+RUN mkdir /var/run/sshd
+RUN echo 'ubuntu:ubuntu' | chpasswd
+RUN sed -i 's/#PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
+
+# noVNC and Websockify
+RUN git clone https://github.com/AtsushiSaito/noVNC.git -b add_clipboard_support /usr/lib/novnc
+RUN pip install --no-cache-dir git+https://github.com/novnc/websockify.git@v0.10.0
+RUN ln -s /usr/lib/novnc/vnc.html /usr/lib/novnc/index.html
+
+# Set remote resize function enabled by default
+RUN sed -i "s/UI.initSetting('resize', 'off');/UI.initSetting('resize', 'remote');/g" /usr/lib/novnc/app/ui.js
+
+# Disable crash report
+RUN sed -i 's/enabled=1/enabled=0/g' /etc/default/apport 
 
 # colorize less
 RUN lesspipe >> ~/.bashrc && \
@@ -147,7 +129,6 @@ RUN lesspipe >> ~/.bashrc && \
 
 # prepare vscode and home
 ADD .devcontainer/.vscode /home/ubuntu/.vscode
-RUN sudo chown -R ubuntu:ubuntu /home/ubuntu
 
 # Source ROS environment automatically
 RUN echo "source /opt/ros/$ROS_DISTRO/setup.bash" >> /home/$USERNAME/.bashrc
@@ -162,24 +143,6 @@ RUN rm -rf /var/lib/apt/lists/*
 # Enable apt-get completion after running `apt-get update` in the container
 RUN rm /etc/apt/apt.conf.d/docker-clean
 
-COPY configs/supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY configs/supervisord/custom_programs.conf /etc/supervisor/conf.d/custom_programs.conf
-COPY configs/supervisord/code_server.conf /etc/supervisor/conf.d/code_server.conf
-
-COPY configs/xfce4_defaults /usr/share/xfwm4/defaults
-
-COPY docker/entrypoint.sh /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-
-COPY .devcontainer/onCreate.sh /onCreate.sh
-RUN chmod +x /onCreate.sh
-
-COPY .devcontainer/postCreate.sh /postCreate.sh
-RUN chmod +x /postCreate.sh
-
-COPY .devcontainer/postAttach.sh /postAttach.sh
-RUN chmod +x /postAttach.sh
-
 # prepare VNC
 RUN mkdir -p "/home/ubuntu/.vnc"
 RUN echo "$PASSWD" | vncpasswd -f > "/home/ubuntu/.vnc/passwd"