updated docker images

Author: StephanKa

docker/Dockerfile

@@ -2,49 +2,51 @@
 # Build and test environment for CI
 # =================================
 
-FROM ubuntu:22.10 as cpp-docker-ci
+FROM ubuntu:22.10 as cpp-docker-common
 
 ARG DEBIAN_FRONTEND=noninteractive
+ENV PATH="${PATH}:/cmake-3.26.3-linux-x86_64/bin/:"
 
 RUN apt-get update && apt-get -y dist-upgrade && apt-get -y install --fix-missing \
+  apturl \
   binutils \
   build-essential \
   bzip2 \
-  cmake \
   cppcheck \
+  ccache \
+  doxygen \
+  graphviz \
   lsb-release \
   ninja-build \
   python3 \
   python3-pip \
+  shellcheck \
   ssh \
   software-properties-common \
   sudo \
   tar \
+  valgrind \
   wget
+RUN wget https://github.com/Kitware/CMake/releases/download/v3.26.3/cmake-3.26.3-linux-x86_64.sh  \
+    && chmod +x cmake-3.26.3-linux-x86_64.sh  \
+    && ./cmake-3.26.3-linux-x86_64.sh --include-subdir --skip-license \
+    && rm cmake-3.26.3-linux-x86_64.sh
 RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
-RUN apt-get -y install clang-format clang-tidy
+RUN apt-get -y install clang-format clang-tidy clang-15
 RUN apt-get autoremove -y && apt-get clean
-RUN pip install --user conan==1.59 Jinja2 jsonschema setuptools
-
 
 
 # =================================
 # DEV environment for local machine
 # =================================
 
-FROM cpp-docker-ci as cpp-docker-dev
+FROM cpp-docker-common as cpp-docker-dev
 
 ARG DEV_USER=dev
+ENV PATH="${PATH}:/home/${DEV_USER}/.local/bin/"
 
-RUN apt-get -y install --fix-missing \
-  ccache \
-  curl \
-  doxygen \
-  graphviz \
-  shellcheck \
-  valgrind \
-  vim \
-  && apt-get autoremove -y && apt-get clean
+RUN apt-get -y install --fix-missing vim \
+    && apt-get autoremove -y && apt-get clean
 
 # Dev user for inside the container
 RUN groupadd -g 1000 ${DEV_USER} && \
@@ -64,3 +66,23 @@ WORKDIR /home/${DEV_USER}
 
 RUN sed -i 's/\\h/docker/;s/01;32m/01;33m/' /home/${DEV_USER}/.bashrc \
   && mkdir /home/${DEV_USER}/git
+
+RUN pip install --user conan==1.59
+
+
+FROM cpp-docker-common as cpp-docker-ci
+
+ARG CI_USER=ci
+ENV PATH="${PATH}:/home/${CI_USER}/.local/bin/"
+
+# Dev user for inside the container
+RUN groupadd -g 1000 ${CI_USER} && \
+  useradd -m -u 1000 -g 1000 -d /home/${CI_USER} -s /bin/bash ${CI_USER} && \
+  usermod -a -G adm,cdrom,sudo,dip,plugdev ${CI_USER} && \
+  echo "${CI_USER}:${CI_USER}" | chpasswd && \
+  echo "${CI_USER}   ALL=(ALL:ALL) ALL" >> /etc/sudoers
+
+COPY ccache.conf /etc/.
+USER ${CI_USER}
+RUN pip install conan==1.59
+WORKDIR /home/${CI_USER}

docker/build-ci-image.sh

@@ -2,4 +2,4 @@
 
 DOCKER_BUILDKIT=1 docker -l debug build \
     --target cpp-docker-ci \
-    -t cppcienv:latest .
+    -t cpp_ci_env:latest .

docker/build-dev-image.sh

@@ -3,4 +3,4 @@
 DOCKER_BUILDKIT=1 docker -l debug build \
     --target cpp-docker-dev \
     --build-arg DEV_USER=dev \
-    -t cppdevenv:latest .
+    -t cpp_dev_env:latest .

docker/cppdev-docker

@@ -1,14 +1,14 @@
 #! /bin/bash
-CONTAINER=cpp_docker_env
-WORKDIR=$(pwd)
-
-if ! /usr/bin/docker ps | grep "${CONTAINER}" > /dev/null; then
-  docker-compose up -d
-fi
+CONTAINER=cpp_dev_env
+WORKDIR=$(pwd)/../
 
 if [ $# -ne 0 ]; then
-  docker exec -i -t -u dev:dev "${CONTAINER}" bash -c "if [ -d \"${WORKDIR}\" ]; then cd ${WORKDIR}; fi; $*"
+  docker run -v ${PWD}/../:/home/dev/workspace -u dev:dev "${CONTAINER}" bash -c "if [ -d \"${WORKDIR}\" ]; then cd ${WORKDIR}; fi; $*"
 else
+  if ! /usr/bin/docker ps | grep "${CONTAINER}" > /dev/null; then
+    docker compose -f docker-compose-dev.yml up -d
+  fi
+
   # (The shell is interactive if bash is called without arguments :)
   docker exec -i -t -u dev:dev "${CONTAINER}" bash -c "if [ -d \"${WORKDIR}\" ]; then cd ${WORKDIR}; fi; bash"
 fi

docker/docker-compose.yml docker/docker-compose-ci.ymldocker/docker-compose.yml renamed to docker/docker-compose-ci.yml

@@ -7,8 +7,8 @@ services:
       - apparmor:unconfined
     cap_add:
       - SYS_PTRACE
-    container_name: cpp_docker_env
-    image: cppdevenv:latest
+    container_name: cpp_ci_env
+    image: cpp_ci_env:latest
     environment:
         - TERM=xterm-256color # For a colored Terminal
         - SSH_AUTH_SOCK=/ssh-agent
@@ -18,10 +18,6 @@ services:
         - ${HOME}/.ssh/config:/home/dev/.ssh/config
         - ${HOME}/.gitconfig:/home/dev/.gitconfig
         - ${HOME}/git:/home/dev/git
-    command: /usr/sbin/sshd -D
     user: root
-    network_mode: "bridge"
-    ports:
-      - "2222:22"
     privileged: true
-    hostname: cpp_docker_env
+    hostname: cpp_docker_ci_env

docker/docker-compose-dev.yml

@@ -0,0 +1,23 @@
+version: '3'
+
+services:
+  ssh:
+    security_opt: # options needed for gdb debugging
+      - seccomp:unconfined
+      - apparmor:unconfined
+    cap_add:
+      - SYS_PTRACE
+    container_name: cpp_dev_env
+    image: cpp_dev_env:latest
+    environment:
+        - TERM=xterm-256color # For a colored Terminal
+        - SSH_AUTH_SOCK=/ssh-agent
+    volumes:
+        - ${PWD}/../:/home/dev/workspace
+    command: /usr/sbin/sshd -D
+    user: root
+    network_mode: "bridge"
+    ports:
+      - "2222:22"
+    privileged: true
+    hostname: cpp_docker_env