Dockerfiles update

Author: rustlluk

Docker/Dockerfile

@@ -3,10 +3,9 @@ FROM $BASE_IMAGE
 
 LABEL maintainer="Lukas Rustler <[email protected]>"
 
-#Non-interactive mode
-ENV DEBIAN_FRONTEND='noninteractive'
+# Non-interactive installation mode
+ENV DEBIAN_FRONTEND=noninteractive
 ARG TARGETPLATFORM
-
 #Change for other python; 3.11 may be too much right now
 ARG PYTHON_VER=3.11
 
@@ -15,27 +14,17 @@ RUN apt update -y && apt install software-properties-common -y && add-apt-reposi
     && apt update && apt install python$PYTHON_VER wget sudo gedit unzip apt-utils curl \
     python$PYTHON_VER-venv nano mesa-utils curl htop net-tools sshfs python$PYTHON_VER-distutils  \
     screen git python$PYTHON_VER-dev libpng-dev libqhull-dev libfreetype6-dev libfreetype6  \
-    pkg-config python3.8-venv python3.8-dev -y
+    pkg-config python3.8-venv python3.8-dev apt-transport-https psmisc tmux gdb gitk autoconf locales gdebi  \
+    terminator meld dos2unix -y
+
+# Set the locale
+RUN locale-gen en_US.UTF-8
 
 #Install pips
 # 3.8 is default at Ubuntu 20.04 and is fine for thing that do not work on newer versions
 RUN curl -sS https://bootstrap.pypa.io/get-pip.py | python$PYTHON_VER &&  \
     curl -sS https://bootstrap.pypa.io/get-pip.py | python3.8
 
-#Default args, that can be changed during build
-ARG UID=1000
-ARG GID=1000
-
-# SSH
-RUN apt install openssh-server -y && sed -i 's/\(^Port\)/#\1/' /etc/ssh/sshd_config &&  \
-    echo Port 2222 >> /etc/ssh/sshd_config && service ssh start
-
-#Add docker user with correct UID and GID; and add him to sudoers
-RUN groupadd -g $GID docker_users && useradd -l -u $UID -G $GID -md /home/docker -s /bin/bash docker && \
-    echo 'docker:docker' | chpasswd && usermod -aG sudo docker && \
-    sed -i.bkp -e 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers && \
-    echo "docker  ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
-
 # VSCode
 RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
        wget -O code.deb "https://code.visualstudio.com/sha/download?build=stable&os=linux-deb-arm64"; \
@@ -45,19 +34,33 @@ RUN if [ "$TARGETPLATFORM" = "linux/arm64" ] ; then \
 
 RUN gdebi -n code.deb && rm code.deb
 
-
-#Pycharm
+# PyCharm
 ARG PYCHARM_VER=2024.3.4
 RUN cd /opt && wget https://download.jetbrains.com/python/pycharm-community-$PYCHARM_VER.tar.gz &&  \
     tar -xvf pycharm-community-$PYCHARM_VER.tar.gz && rm pycharm-community-$PYCHARM_VER.tar.gz &&  \
     mv pycharm-community-$PYCHARM_VER pycharm && ln -s /opt/pycharm/bin/pycharm.sh /usr/bin/pycharm && chmod +x /usr/bin/pycharm
 
+
+RUN apt remove python3-psutil -y
+RUN python$PYTHON_VER -m pip install --upgrade pip && python$PYTHON_VER -m pip install "numpy<2" cython psutil open3d pybullet roboticstoolbox-python --ignore-installed  --no-cache-dir
+
+#Default args, that can be changed during build
+ARG UID=1000
+ARG GID=1000
+
+# SSH
+RUN apt install openssh-server -y && sed -i 's/\(^Port\)/#\1/' /etc/ssh/sshd_config &&  \
+    echo Port 2222 >> /etc/ssh/sshd_config && service ssh start
+
+#Add docker user with correct UID and GID; and add him to sudoers
+RUN groupadd -g $GID docker_users && useradd -l -u $UID -G $GID -md /home/docker -s /bin/bash docker && \
+    echo 'docker:docker' | chpasswd && usermod -aG sudo docker && \
+    sed -i.bkp -e 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers && \
+    echo "docker  ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
 RUN sudo ln -sf /usr/bin/python$PYTHON_VER /usr/local/bin/python && sudo ln -sf /usr/bin/python$PYTHON_VER /usr/local/bin/python3
 RUN echo "export PATH=/usr/local/bin:$PATH" >> /home/docker/.bashrc
 
-# pybullet, robot_description, numpy, etc.
-RUN apt remove python3-psutil -y
-RUN python$PYTHON_VER -m pip install --user --upgrade pip && python$PYTHON_VER -m pip install psutil pybullet "numpy<2" scipy cython matplotlib roboticstoolbox-python --ignore-installed --no-cache-dir
 RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && git checkout dev && python$PYTHON_VER setup.py install --user
 
 # Delete thingies from aptitude

Docker/Dockerfile.gitpod

@@ -57,9 +57,6 @@ RUN git clone https://github.com/novnc/noVNC.git /opt/novnc && \
     git clone https://github.com/novnc/websockify /opt/novnc/utils/websockify && \
     echo "<html><head><meta http-equiv=\"Refresh\" content=\"0; url=vnc.html?autoconnect=true&reconnect=true&reconnect_delay=1000&resize=scale&quality=9\"></head></html>" > /opt/novnc/index.html
 
-# Install informative git for bash
-RUN git clone https://github.com/magicmonty/bash-git-prompt.git /home/gitpod/.bash-git-prompt --depth=1
-
 # Set up script to launch graphics and vnc
 COPY additional_files/start-vnc-session.sh /usr/bin/start-vnc-session.sh
 RUN chmod +x /usr/bin/start-vnc-session.sh && \
@@ -81,28 +78,30 @@ RUN python$PYTHON_VER -m pip install --upgrade pip && python$PYTHON_VER -m pip i
 RUN useradd -l -u 33333 -G sudo -md /home/gitpod -s /bin/bash gitpod && \
     echo 'gitpod:gitpod' | chpasswd && usermod -aG sudo gitpod && \
     sed -i.bkp -e 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers && \
-    echo "gitpod  ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && mkdir -p /home/gitpod/Desktop \
+    echo "gitpod  ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+# Install informative git for bash
+RUN git clone https://github.com/magicmonty/bash-git-prompt.git /home/gitpod/.bash-git-prompt --depth=1
 
-RUN echo "alias vnc='export DISPLAY=\$VNC_DISPLAY'" >> /home/gitpod/.bashrc
+RUN echo "alias vnc='export DISPLAY=:1'" >> /home/gitpod/.bashrc
 RUN echo "export PORT=5901" >> /home/gitpod/.bashrc
+
 USER gitpod
 # Set up VSCode launcher
 COPY ["additional_files/Visual Studio Code.desktop", "/home/gitpod/Desktop/Visual Studio Code.desktop"]
-RUN chown gitpod:gitpod "/home/gitpod/Desktop/Visual Studio Code.desktop" && chmod +x "/home/gitpod/Desktop/Visual Studio Code.desktop" && \
-    dos2unix "/home/gitpod/Desktop/Visual Studio Code.desktop"
+RUN sudo chown gitpod:gitpod "/home/gitpod/Desktop/Visual Studio Code.desktop" && chmod +x "/home/gitpod/Desktop/Visual Studio Code.desktop"
 COPY ["additional_files/PyCharm.desktop", "/home/gitpod/Desktop/PyCharm.desktop"]
 
-RUN chown gitpod:gitpod "/home/gitpod/Desktop/PyCharm.desktop" && chmod +x "/home/gitpod/Desktop/PyCharm.desktop" && \
-    dos2unix "/home/gitpod/Desktop/PyCharm.desktop" \
+RUN sudo chown gitpod:gitpod "/home/gitpod/Desktop/PyCharm.desktop" && chmod +x "/home/gitpod/Desktop/PyCharm.desktop"
 
 RUN cd /home/gitpod && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && git checkout dev && python$PYTHON_VER setup.py install --user
 
 
 RUN sudo ln -sf /usr/bin/python$PYTHON_VER /usr/local/bin/python && sudo ln -sf /usr/bin/python$PYTHON_VER /usr/local/bin/python3
 RUN echo "export PATH=/usr/local/bin:$PATH" >> /home/gitpod/.bashrc
 RUN echo "export BROWSER=/usr/bin/firefox" >> /home/gitpod/.bashrc
-ENV VNC_DISPLAY=:99
-ENV DISPLAY=:99
+ENV DISPLAY=:1
+
 # Clean up unnecessary installation products
 RUN sudo rm -Rf /var/lib/apt/lists/*
 

Docker/Dockerfile.vnc

@@ -57,9 +57,6 @@ RUN git clone https://github.com/novnc/noVNC.git /opt/novnc && \
     git clone https://github.com/novnc/websockify /opt/novnc/utils/websockify && \
     echo "<html><head><meta http-equiv=\"Refresh\" content=\"0; url=vnc.html?autoconnect=true&reconnect=true&reconnect_delay=1000&resize=scale&quality=9\"></head></html>" > /opt/novnc/index.html
 
-# Install informative git for bash
-RUN git clone https://github.com/magicmonty/bash-git-prompt.git /home/docker/.bash-git-prompt --depth=1
-
 # Set up script to launch graphics and vnc
 COPY additional_files/start-vnc-session.sh /usr/bin/start-vnc-session.sh
 RUN chmod +x /usr/bin/start-vnc-session.sh && \
@@ -81,19 +78,20 @@ RUN python$PYTHON_VER -m pip install --user --upgrade pip && python$PYTHON_VER -
 RUN useradd -l -u 33333 -G sudo -md /home/docker -s /bin/bash docker && \
     echo 'docker:docker' | chpasswd && usermod -aG sudo docker && \
     sed -i.bkp -e 's/%sudo\s\+ALL=(ALL\(:ALL\)\?)\s\+ALL/%sudo ALL=NOPASSWD:ALL/g' /etc/sudoers && \
-    echo "docker  ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers && mkdir -p /home/docker/Desktop \
+    echo "docker  ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
+
+# Install informative git for bash
+RUN git clone https://github.com/magicmonty/bash-git-prompt.git /home/docker/.bash-git-prompt --depth=1
 
 RUN echo "alias vnc='export DISPLAY=:99'" >> /home/docker/.bashrc
 RUN echo "export PORT=5999" >> /home/docker/.bashrc
 USER docker
 # Set up VSCode launcher
 COPY ["additional_files/Visual Studio Code.desktop", "/home/docker/Desktop/Visual Studio Code.desktop"]
-RUN chown docker:docker "/home/docker/Desktop/Visual Studio Code.desktop" && chmod +x "/home/docker/Desktop/Visual Studio Code.desktop" && \
-    dos2unix "/home/docker/Desktop/Visual Studio Code.desktop"
+RUN sudo chown docker:docker "/home/docker/Desktop/Visual Studio Code.desktop" && chmod +x "/home/docker/Desktop/Visual Studio Code.desktop"
 
 COPY ["additional_files/PyCharm.desktop", "/home/docker/Desktop/PyCharm.desktop"]
-RUN chown docker:docker "/home/docker/Desktop/PyCharm.desktop" && chmod +x "/home/docker/Desktop/PyCharm.desktop" && \
-    dos2unix "/home/docker/Desktop/PyCharm.desktop"
+RUN sudo chown docker:docker "/home/docker/Desktop/PyCharm.desktop" && chmod +x "/home/docker/Desktop/PyCharm.desktop"
 
 RUN cd /home/docker && git clone https://github.com/rustlluk/pyCub.git && cd pyCub && git checkout dev && python$PYTHON_VER setup.py install --user