Feat/light and glovy (#34)

* Releasing new base image (#33) * align cicd and dockerfiles * clean secrets * Bump anothrNick/github-tag-action from 1.39.0 to 1.46.0 (#14) Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.39.0 to 1.46.0. - [Release notes](https://github.com/anothrNick/github-tag-action/releases) - [Commits](anothrNick/github-tag-action@1.39.0...1.46.0) --- updated-dependencies: - dependency-name: anothrNick/github-tag-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix tigervnc install * add tugbot rviz configuration * use tugbot as default instead * set initialpose as default initialization topic * Bump anothrNick/github-tag-action from 1.46.0 to 1.61.0 (#30) * DP-860 : align cicd and dockerfiles (#15) * align cicd and dockerfiles * clean secrets * Bump anothrNick/github-tag-action from 1.39.0 to 1.46.0 (#14) Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.39.0 to 1.46.0. - [Release notes](https://github.com/anothrNick/github-tag-action/releases) - [Commits](anothrNick/github-tag-action@1.39.0...1.46.0) --- updated-dependencies: - dependency-name: anothrNick/github-tag-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * fix tigervnc install Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Bump anothrNick/github-tag-action from 1.46.0 to 1.61.0 Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.46.0 to 1.61.0. - [Release notes](https://github.com/anothrNick/github-tag-action/releases) - [Commits](anothrNick/github-tag-action@1.46.0...1.61.0) --- updated-dependencies: - dependency-name: anothrNick/github-tag-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Alex Fernandes <84147256+AlexFernandes-MOVAI@users.noreply.github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * 2.4.0 - Feat: update base and slim images like in CE (#9) * change bases * more fixes * fix docker registry * Update Dockerfile * update base images Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Bump anothrNick/github-tag-action from 1.46.0 to 1.61.0 (#32) Bumps [anothrNick/github-tag-action](https://github.com/anothrNick/github-tag-action) from 1.46.0 to 1.61.0. - [Release notes](https://github.com/anothrNick/github-tag-action/releases) - [Commits](anothrNick/github-tag-action@1.46.0...1.61.0) --- updated-dependencies: - dependency-name: anothrNick/github-tag-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * bump base images * fix repo * fix duplicate Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jorge Pais Ribeiro <jorge.ribeiro@mov.ai> Co-authored-by: Jorge Pais Ribeiro <88839871+jmspribeiro@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * remove rqt, add foxglove * add back rqt, clean icons and menus * fix $ROS_DISTRO --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Jorge Pais Ribeiro <jorge.ribeiro@mov.ai> Co-authored-by: Jorge Pais Ribeiro <88839871+jmspribeiro@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
MOV-AI · Feb 2, 2023 · 9369dd1 · 9369dd1
1 parent e4d4e95
commit 9369dd1
Show file tree

Hide file tree

Showing 12 changed files with 94 additions and 24 deletions.
diff --git a/files/ubuntu/icewm/.icewm/menu b/files/ubuntu/icewm/.icewm/menu
@@ -1,5 +1,17 @@
-prog xterm xterm xterm
-prog Terminator terminator /usr/bin/terminator
-prog RViz rviz /usr/local/bin/rviz.sh
-separator
-
+menu "Development" folder {
+prog "Foxglove Studio" foxglove-studio /usr/local/bin/foxglove
+prog RViz /usr/share/rviz/icons/package.png /usr/local/bin/rviz.sh
+}
+menu "System" folder {
+menu "TerminalEmulator" folder {
+prog "Terminator" terminator terminator
+prog "UXTerm" mini.xterm uxterm
+prog "XTerm" mini.xterm xterm
+}
+}
+menu "Utility" folder {
+prog "Terminator" terminator terminator
+menu "TextEditor" folder {
+prog "Vim" gvim x-terminal-emulator -e vim
+}
+}
diff --git a/files/ubuntu/icewm/.icewm/preferences b/files/ubuntu/icewm/.icewm/preferences
@@ -1,3 +1,4 @@
 WorkspaceNames=" 1 "
-TaskBarShowMailboxStatus = 0
-TaskBarShowWorkspaces = 0
+TaskBarShowMailboxStatus=0
+TaskBarShowWorkspaces=0
+ShowProgramsMenu=0
diff --git a/files/ubuntu/icewm/.icewm/toolbar b/files/ubuntu/icewm/.icewm/toolbar
@@ -1,4 +1,5 @@
 prog xterm xterm xterm
 prog Terminator terminator /usr/bin/terminator
-prog RViz rviz /usr/local/bin/rviz.sh
+prog RViz /usr/share/rviz/icons/package.png /usr/local/bin/rviz.sh
+prog Foxglove foxglove-studio /usr/local/bin/foxglove
 separator
diff --git a/files/ubuntu/install/foxglove.sh b/files/ubuntu/install/foxglove.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+FOXGLOVE_VERSION=1.39.0
+FOXGLOVE_ARCH=amd64
+FOXGLOVE_DEB_URL=https://github.com/foxglove/studio/releases/download/v${FOXGLOVE_VERSION}/foxglove-studio-${FOXGLOVE_VERSION}-linux-${FOXGLOVE_ARCH}.deb
+
+mkdir -p /tmp/foxglove
+
+wget --show-progress --progress=bar:force:noscroll $FOXGLOVE_DEB_URL -q -P /tmp/foxglove
+
+apt-get update
+DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    /tmp/foxglove/foxglove-studio-${FOXGLOVE_VERSION}-linux-${FOXGLOVE_ARCH}.deb
+
+cat << EOF  > /usr/local/bin/foxglove
+export FOXGLOVE_DISABLE_SIGN_IN=true
+"/opt/Foxglove Studio/foxglove-studio" --no-sandbox
+EOF
+
+chmod +x /usr/local/bin/foxglove
+
+apt-get autoremove -y
+apt-get clean -y
+rm -rf /var/lib/apt/lists/*
+rm -rf /tmp/foxglove
diff --git a/files/ubuntu/install/icewm_ui.sh b/files/ubuntu/install/icewm_ui.sh
@@ -6,4 +6,6 @@ echo "Install IceWM UI components"
 apt-get update
 apt-get install -y --no-install-recommends supervisor icewm xterm xfonts-base xauth xinit dbus-x11 libdbus-glib-1-2
 apt-get purge -y pm-utils *screensaver*
+apt-get autoremove -y
 apt-get clean -y
+rm -rf /var/lib/apt/lists/*
diff --git a/files/ubuntu/install/install_custom_fonts.sh b/files/ubuntu/install/install_custom_fonts.sh
@@ -3,5 +3,8 @@
 set -e
 
 echo "Installing ttf-wqy-zenhei"
+apt-get update
 apt-get install --no-install-recommends -y ttf-wqy-zenhei
+apt-get autoremove -y
 apt-get clean -y
+rm -rf /var/lib/apt/lists/*
diff --git a/files/ubuntu/install/libnss_wrapper.sh b/files/ubuntu/install/libnss_wrapper.sh
@@ -4,8 +4,10 @@ set -e
 
 echo "Install nss-wrapper to be able to execute image as non-root user"
 apt-get update
-apt-get install -y libnss-wrapper gettext
+apt-get install -y --no-install-recommends libnss-wrapper gettext
+apt-get autoremove -y
 apt-get clean -y
+rm -rf /var/lib/apt/lists/*
 
 echo "add 'source generate_container_user' to .bashrc"
 

diff --git a/files/common/install/ros-tools.sh → files/ubuntu/install/ros-tools.sh b/files/common/install/ros-tools.sh → files/ubuntu/install/ros-tools.sh
@@ -8,6 +8,7 @@ curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo ap
 
 echo "Install ROS-Tools components"
 apt-get update
-apt-get install --no-install-recommends -y rviz \
-    "ros-$ROS_DISTRO-rqt" "ros-$ROS_DISTRO-rqt-common-plugins"
+apt-get install --no-install-recommends -y rviz
+apt-get autoremove -y
 apt-get clean -y
+rm -rf /var/lib/apt/lists/*
diff --git a/files/ubuntu/install/rqt.sh b/files/ubuntu/install/rqt.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+### every exit != 0 fails the script
+set -e
+
+echo "Setup ROS-Tools repo"
+sh -c 'echo "deb http://packages.ros.org/ros/ubuntu $(lsb_release -sc) main" > /etc/apt/sources.list.d/ros-latest.list'
+curl -s https://raw.githubusercontent.com/ros/rosdistro/master/ros.asc | sudo apt-key add -
+
+echo "Install ROS-Tools components"
+apt-get update
+apt-get install -y ros-$ROS_DISTRO-rqt-plot ros-$ROS_DISTRO-rqt-tf-tree ros-$ROS_DISTRO-rqt-reconfigure --no-install-recommends
+apt-get autoremove -y
+apt-get clean -y
+rm -rf /var/lib/apt/lists/*
diff --git a/files/ubuntu/install/tigervnc.sh b/files/ubuntu/install/tigervnc.sh
@@ -2,5 +2,8 @@
 set -e
 
 echo "Install TigerVNC server"
-apt-get install -y tigervnc-standalone-server
+apt-get update
+apt-get install -y --no-install-recommends tigervnc-standalone-server tigervnc-common
+apt-get autoremove -y
 apt-get clean -y
+rm -rf /var/lib/apt/lists/*
diff --git a/files/ubuntu/install/tools.sh b/files/ubuntu/install/tools.sh
@@ -6,7 +6,9 @@ echo "Install some common tools for further installation"
 apt-get update
 apt-get install --no-install-recommends -y terminator vim wget net-tools locales bzip2 procps \
     python3-numpy #used for websockify/novnc
+apt-get autoremove -y
 apt-get clean -y
+rm -rf /var/lib/apt/lists/*
 
 echo "generate locales for $LANG"
 locale-gen "$LANG"

diff --git a/noetic/Dockerfile b/noetic/Dockerfile
@@ -44,9 +44,6 @@ ENV HOME=${USER_HOME} \
     DEBIAN_FRONTEND=noninteractive \
     LANG='en_US.UTF-8' LANGUAGE='en_US:en' LC_ALL='en_US.UTF-8'
 
-### ROS Config
-ENV ROS_MASTER_URI="http://${ROS_MASTER}:${ROS_MASTER_PORT}"
-
 WORKDIR ${HOME}
 
 USER root
@@ -59,18 +56,25 @@ COPY files/ubuntu/icewm/ files/home $HOME/
 
 COPY files/bin /usr/local/bin/
 
+### Install some common tools
 RUN find $INST_SCRIPTS -name '*.sh' -exec chmod a+x {} + && \
-    ### Install some common tools
     $INST_SCRIPTS/tools.sh && \
     ### Install custom fonts
-    $INST_SCRIPTS/install_custom_fonts.sh && \
-    ### Install xvnc-server & noVNC - HTML5 based VNC viewer
-    $INST_SCRIPTS/tigervnc.sh && \
-    $INST_SCRIPTS/no_vnc.sh && \
-    ### Install IceWM UI
-    $INST_SCRIPTS/icewm_ui.sh && \
-    ### Install ROS1 Melodic tools
-    $INST_SCRIPTS/ros-tools.sh && \
+    $INST_SCRIPTS/install_custom_fonts.sh
+### Install xvnc-server & noVNC - HTML5 based VNC viewer
+RUN $INST_SCRIPTS/tigervnc.sh && \
+    $INST_SCRIPTS/no_vnc.sh
+
+### Install IceWM UI
+RUN $INST_SCRIPTS/icewm_ui.sh
+
+### Install Foxglove
+RUN $INST_SCRIPTS/foxglove.sh
+
+### Install ROS1 tools
+ENV ROS_MASTER_URI="http://${ROS_MASTER}:${ROS_MASTER_PORT}"
+RUN $INST_SCRIPTS/rqt.sh
+RUN $INST_SCRIPTS/ros-tools.sh && \
     ### Clean
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* && \