Update docker images

dockerfiles/builder.Dockerfile

+ARG DISTRO
+
+FROM ubuntu:${DISTRO}
+
+# Avoid warnings by switching to noninteractive
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Setup environment
+RUN apt-get update && apt-get install -y apt-utils
+
+RUN apt-get install -y \
+    locales \
+    && sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US:en
+ENV LC_ALL en_US.UTF-8
+
+# Configure apt and install base packages
+RUN apt-get update && apt-get -y install --no-install-recommends \
+    apt-transport-https \
+    build-essential \
+    ca-certificates \
+    curl \
+    gnupg-agent \
+    software-properties-common \
+    dialog 2>&1 \
+    checkinstall \
+    # clang
+    clang-format clang-tidy clang-tools clang \
+    clangd libc++-dev libc++1 libc++abi-dev \
+    libc++abi1 libclang-dev libclang1 liblldb-dev \
+    libllvm-ocaml-dev libomp-dev libomp5 lld lldb \
+    llvm-dev llvm-runtime llvm python3-clang \
+    # ccmake
+    cmake-curses-gui \
+    # AppimageTool
+    binutils coreutils desktop-file-utils fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-setuptools squashfs-tools strace util-linux zsync \
+    gdb \
+    git \
+    git-lfs \
+    less \
+    make \
+    nano \
+    libnotify-bin notify-osd \
+    openssh-client \
+    pkg-config \
+    terminator \
+    trash-cli \
+    valgrind \
+    xterm \
+    wget \
+    zsh
+
+# Update this date to re-run the image final update
+LABEL image.date=21-12-2022
+
+# Update final image
+RUN apt-get update \
+    && apt-get -y upgrade
+
+# PDF-MIX-TOOL
+RUN apt-get update && apt-get -y install \
+    qtbase5-dev qtbase5-dev-tools qttools5-dev qttools5-dev-tools \
+    libqt5svg5 libqt5svg5-dev \
+    qpdf libqpdf-dev\
+    imagemagick \
+    libmagick++-dev
+
+# WORKDIR /srcs
+RUN wget https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O /usr/local/bin/appimagetool
+RUN chmod +x /usr/local/bin/appimagetool
+RUN pip3 install appimage-builder
+
+CMD ["zsh"]
+ENV SHELL /usr/bin/zsh
+ENV RUNNING_IN_DOCKER true
+
+# Switch back to dialog for any ad-hoc use of apt-get
+ENV DEBIAN_FRONTEND=
\ No newline at end of file

dockerfiles/devenv.Dockerfile

@@ -17,21 +17,21 @@ ENV LANGUAGE en_US:en
 ENV LC_ALL en_US.UTF-8
 
 # Configure apt and install packages
-RUN apt-get -y install --no-install-recommends \
+RUN apt-get update && apt-get -y install --no-install-recommends \
     apt-transport-https \
     ca-certificates \
     curl \
     gnupg-agent \
     software-properties-common \
     dialog 2>&1 \
-    # Verify if git, process tools, lsb-release (common in install instructions for CLIs) are installed
-    # Install the https transport support package for The Artifactory debian repository
     checkinstall \
+    # clang
     clang-format clang-tidy clang-tools clang \
-    clangd libc++-dev libc++1 libc++abi-dev \
-    libc++abi1 libclang-dev libclang1 liblldb-dev \
-    libllvm-ocaml-dev libomp-dev libomp5 lld lldb \
-    llvm-dev llvm-runtime llvm python3-clang \
+    libc++-dev libc++1 libc++abi-dev \
+    libc++abi1 libclang-dev libclang1  \
+    libomp-dev libomp5 lld lldb \
+    llvm-dev llvm-runtime llvm \
+    # ccmake
     cmake-curses-gui \
     direnv \
     gdb \
@@ -62,7 +62,9 @@ RUN if [ "${ROS_DISTRO}" = "noetic"  ]; \
             python3-click \
             python3-numpy \
             python3-osrf-pycommon \
-            python3-vcstool; \
+            python3-vcstool \
+            # clang
+            clangd liblldb-dev libllvm-ocaml-dev python3-clang; \
     elif [ "${ROS_DISTRO}" = "melodic" ]; \
     then \
         apt-get -y install \
@@ -173,10 +175,10 @@ RUN apt-get update && apt-get install -y \
     ros-${ROS_DISTRO}-twist-mux \
     ros-${ROS_DISTRO}-ur-client-library \
     ros-${ROS_DISTRO}-ur-msgs \
+    ros-${ROS_DISTRO}-usb-cam \
     ros-${ROS_DISTRO}-velocity-controllers \
     ros-${ROS_DISTRO}-warehouse-ros-mongo
 
-
 RUN if [ "${ROS_DISTRO}" = "noetic"  ]; \
     then \
         apt-get -y install \
@@ -206,6 +208,7 @@ RUN if [ "${ROS_DISTRO}" = "noetic"  ]; \
     then \
         dpkg -i bat*.deb; \
         dpkg -i lsd*.deb; \
+        dpkg -i ripgrep*.deb; \
     elif [ "${ROS_DISTRO}" = "melodic"  ]; \
     then \
         dpkg -i *.deb; \
@@ -215,8 +218,10 @@ RUN if [ "${ROS_DISTRO}" = "noetic"  ]; \
 
 RUN rm -rf *
 
+RUN apt-get --reinstall install -y libnotify-bin notify-osd
+
 # Update this date to re-run the image final update
-LABEL image.date=15-12-2022
+LABEL image.date=22-12-2022
 
 # Update final image
 RUN apt-get update \

dotfiles/.zshrc

@@ -5,51 +5,58 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
   source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 fi
 
+#zmodload zsh/zprof
+
 # If you come from bash you might have to change your $PATH.
-export PATH=$HOME/.local/bin:$PATH
+# export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # Path to your oh-my-zsh installation.
-export ZSH="/home/andres/.oh-my-zsh"
+export ZSH=~/.oh-my-zsh
 
-# Set name of the theme to load --- if set to "random", it will
-# load a random theme each time oh-my-zsh is loaded, in which case,
-# to know which specific one was loaded, run: echo $RANDOM_THEME
-# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
-ZSH_THEME="powerlevel10k/powerlevel10k"
+# Uncomment the following line to display red dots whilst waiting for completion.
+COMPLETION_WAITING_DOTS="true"
 
-# Set up the prompt
-autoload -Uz promptinit
-promptinit
-prompt adam1
+source "$HOME/.homesick/repos/homeshick/homeshick.sh"
+fpath=($HOME/.homesick/repos/homeshick/completions $fpath)
 
-setopt histignorealldups # sharehistory
-setopt no_share_history
+source ~/antigen.zsh
+antigen use oh-my-zsh
 
-# Uncomment the following line to enable command auto-correction.
-ENABLE_CORRECTION="true"
+antigen theme romkatv/powerlevel10k
 
-# Uncomment the following line to display red dots whilst waiting for completion.
-# You can also set it to another string to have that shown instead of the default red dots.
-# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
-# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
-COMPLETION_WAITING_DOTS="true"
+antigen bundle docker
+antigen bundle git
+antigen bundle globalias
+antigen bundle last-working-dir
+antigen bundle sudo
+antigen bundle zsh-users/zsh-history-substring-search
+antigen bundle zsh-users/zsh-syntax-highlighting
+antigen bundle wfxr/forgit
+antigen bundle paulirish/git-open
+antigen bundle popstas/zsh-command-time
+antigen bundle MichaelAquilina/zsh-auto-notify
+antigen bundle MichaelAquilina/zsh-you-should-use
+antigen bundle zsh-users/zsh-autosuggestions
+
+antigen apply
+
+#ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=0'
 
-# Uncomment the following line if you want to change the command execution time
-# stamp shown in the history command output.
-# You can set one of the optional three formats:
-# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
-# or set a custom format using the strftime function format specifications,
-# see 'man strftime' for details.
-HIST_STAMPS="dd/mm/yyyy"
+# command-line fuzzy finder
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+source $HOME/.init_shell
+
+if [ -f ~/.bash_aliases ]; then
+    . ~/.bash_aliases
+fi
 
-# Which plugins would you like to load?
-# Standard plugins can be found in $ZSH/plugins/
-# Custom plugins may be added to $ZSH_CUSTOM/plugins/
-# Example format: plugins=(rails git textmate ruby lighthouse)
-# Add wisely, as too many plugins slow down shell startup.
-plugins=(zsh-syntax-highlighting sudo git last-working-dir globalias you-should-use zsh-autosuggestions history-substring-search)  
+#zprof
 
-source $ZSH/oh-my-zsh.sh
+export FZF_DEFAULT_COMMAND='rg --files --hidden --follow --no-ignore-vcs'
+export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
+#export FZF_ALT_C_COMMAND="fd -t d --hidden --follow --exclude \".git\" . $HOME"
+export FZF_ALT_C_COMMAND="fd -t d --hidden --follow --exclude \".git\" ."
 
 # Create a cache folder if it isn't exists
 if [ ! -d "$HOME/.cache/zsh" ]; then
@@ -69,14 +76,11 @@ source ${HOME}/srcs/development_environment/dotfiles/docker.bash
 source ${HOME}/srcs/development_environment/dotfiles/ros.bash
 source ${HOME}/srcs/development_environment/dotfiles/system.bash
 
-eval "$(direnv hook zsh)"
-
-# Add fuzzy search app
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+# To add direnv app
+# eval "$(direnv hook zsh)"
 
 # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
 
 # Finalize Powerlevel10k instant prompt. Should stay at the bottom of ~/.zshrc.
 (( ! ${+functions[p10k-instant-prompt-finalize]} )) || p10k-instant-prompt-finalize
-

dotfiles/.zshrc copy

+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
+# If you come from bash you might have to change your $PATH.
+export PATH=$HOME/.local/bin:$PATH
+
+# Path to your oh-my-zsh installation.
+export ZSH="/home/andres/.oh-my-zsh"
+
+# Set name of the theme to load --- if set to "random", it will
+# load a random theme each time oh-my-zsh is loaded, in which case,
+# to know which specific one was loaded, run: echo $RANDOM_THEME
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
+ZSH_THEME="powerlevel10k/powerlevel10k"
+
+# Set up the prompt
+autoload -Uz promptinit
+promptinit
+prompt adam1
+
+setopt histignorealldups # sharehistory
+setopt no_share_history
+
+# Uncomment the following line to enable command auto-correction.
+ENABLE_CORRECTION="true"
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+COMPLETION_WAITING_DOTS="true"
+
+# Uncomment the following line if you want to change the command execution time
+# stamp shown in the history command output.
+# You can set one of the optional three formats:
+# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
+# or set a custom format using the strftime function format specifications,
+# see 'man strftime' for details.
+HIST_STAMPS="dd/mm/yyyy"
+
+# Which plugins would you like to load?
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
+# Example format: plugins=(rails git textmate ruby lighthouse)
+# Add wisely, as too many plugins slow down shell startup.
+plugins=(zsh-syntax-highlighting sudo git last-working-dir globalias you-should-use zsh-autosuggestions history-substring-search)  
+
+source $ZSH/oh-my-zsh.sh
+
+# Create a cache folder if it isn't exists
+if [ ! -d "$HOME/.cache/zsh" ]; then
+    mkdir -p $HOME/.cache/zsh
+fi
+
+# Define a custom file for compdump
+export ZSH_COMPDUMP="$HOME/.cache/zsh/zcompdump-$HOST-$ZSH_VERSION"
+
+# User configuration
+
+export EDITOR="code -r"
+
+# Include dotfiles
+source ${HOME}/srcs/development_environment/dotfiles/git.bash
+source ${HOME}/srcs/development_environment/dotfiles/docker.bash
+source ${HOME}/srcs/development_environment/dotfiles/ros.bash
+source ${HOME}/srcs/development_environment/dotfiles/system.bash
+
+eval "$(direnv hook zsh)"
+
+# Add fuzzy search app
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+# Finalize Powerlevel10k instant prompt. Should stay at the bottom of ~/.zshrc.
+(( ! ${+functions[p10k-instant-prompt-finalize]} )) || p10k-instant-prompt-finalize
+

dotfiles/docker.bash → dotfiles/docker.sh

@@ -16,7 +16,9 @@ function dockbuild(){
 
 # Run container with rocker
 # usage: rundock {noetic, melodic} [{remodel_ws, odin_ws}] [cmd]
+# ToDo Add extra parameters by arg
 # To share docker --volume /var/run/docker.sock:/var/run/docker.sock:ro
+# To share video (usb-cam) --volume /dev/video0:/dev/video0
 function rundock() {
     # Check if the image exist
     if [[ "$(docker images -q devenv:$1 2> /dev/null)" == "" ]]; then

dotfiles/ros.bash → dotfiles/ros.sh

@@ -19,12 +19,15 @@ if [ -z $SHELL ]; then echo "SHELL not set"; else ext=$(basename ${SHELL}); fi
 
 # Source rosmon
 function smon(){
+    if [[ -f "/opt/ros/${ROS_DISTRO}/etc/catkin/profile.d/50-rosmon.${ext}" ]]; then
         source /opt/ros/${ROS_DISTRO}/etc/catkin/profile.d/50-rosmon.${ext}
+    fi
 }
 
 # cd to the root of the workspace
 function roshome(){
     roscd && cd ..
+    ROS_HOME=${PWD}
 }
 
 # Source the current workspace
@@ -35,12 +38,14 @@ function sourcews(){
 # Source the current workspace
 function sourceros(){
     source /opt/ros/${ROS_DISTRO}/setup.${ext} && smon
+    ROS_HOME="/opt/ros/${ROS_DISTRO}/"
 }
 
 # Source the current workspace
 function sourcethis(){
     pwd_st=${PWD}
     roshome && sourcews
+    echo "Sourcing: ${ROS_HOME}"
     cd ${pwd_st}
 }
 
@@ -75,7 +80,7 @@ function runci(){
     fi
 }
 
-# If terminal starts in a ws, auto source it (useful for vscode)
+# if a new terminal starts in a ws, auto source it (useful for vscode)
 if [ -z ${ROS_DISTRO+x} ]; then ;
 else
     pwd_init=${PWD}
@@ -83,12 +88,14 @@ else
     WS_name=${cropped%%/*}
     WS_path=${HOME}/ros/${ROS_DISTRO}/${WS_name}
     FILE=${WS_path}/devel/setup.${ext}
+    # if PWD belongs to ROS ws then source it
     if [[ -f $FILE ]]; then
         cd ${WS_path}
         source $FILE
         cd ${pwd_init}
+        ROS_HOME=${WS_path}
     else
-        source /opt/ros/${ROS_DISTRO}/setup.${ext}
+        sourceros
     fi
 fi
 

srcs_list.txt

@@ -52,3 +52,6 @@ git clone --depth=1 https://github.com/mattmc3/antidote.git ${ZDOTDIR:-~}/.antid
 
 zsh-you-shuould-use
 https://github.com/MichaelAquilina/zsh-you-should-use.git
+
+git@git.code.tecnalia.com:miguel.prada/rosem.git
+git@git.code.tecnalia.com:miguel.prada/gitlab_templates.git