provide two docker layers (CI and dev)

Author: arnemertz

docker/Dockerfile

@@ -1,48 +1,60 @@
-FROM ubuntu:20.04
+# =================================
+# Build and test environment for CI
+# =================================
+
+FROM ubuntu:20.04 as cpp-docker-ci
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update && apt-get -y dist-upgrade && apt-get -y install --fix-missing \
   binutils \
   build-essential \
   bzip2 \
-  ccache \
   clang-format \
   cmake \
-  curl \
-  gdb \
-  gdbserver \
-  git \
-  locales \
   python \
   python3-pip \
-  rsync \
-  ruby \
-  shellcheck \
   ssh \
   sudo \
   tar \
+  && apt-get autoremove -y && apt-get clean
+
+
+
+
+
+
+# =================================
+# DEV environment for local machine
+# =================================
+
+FROM cpp-docker-ci as cpp-docker-dev
+
+ARG DEV_USER=dev
+
+RUN apt-get -y install --fix-missing \
+  ccache \
+  curl \
+  shellcheck \
   valgrind \
   vim \
   && apt-get autoremove -y && apt-get clean
 
-RUN locale-gen en_US.utf8 en_GB.utf8 de_DE.utf8 && update-locale
-
-RUN groupadd -g 1000 dev && \
-  useradd -m -u 1000 -g 1000 -d /home/dev -s /bin/bash dev && \
-  usermod -a -G adm,cdrom,sudo,dip,plugdev dev && \
-  echo 'dev:dev' | chpasswd && \
-  echo "dev   ALL=(ALL:ALL) ALL" >> /etc/sudoers
+# Dev user for inside the container
+RUN groupadd -g 1000 ${DEV_USER} && \
+  useradd -m -u 1000 -g 1000 -d /home/${DEV_USER} -s /bin/bash ${DEV_USER} && \
+  usermod -a -G adm,cdrom,sudo,dip,plugdev ${DEV_USER} && \
+  echo "${DEV_USER}:${DEV_USER}" | chpasswd && \
+  echo "${DEV_USER}   ALL=(ALL:ALL) ALL" >> /etc/sudoers
 
 # fix "Missing privilege separation directory" error in SSHD
 # see: https://bugs.launchpad.net/ubuntu/+source/openssh/+bug/45234
 RUN mkdir /var/run/sshd && chmod 0755 /var/run/sshd
 
 COPY ccache.conf /etc/.
 
-USER dev
-WORKDIR /home/dev
-
-RUN sed -i 's/\\h/docker/;s/01;32m/01;33m/' /home/dev/.bashrc
+USER ${DEV_USER}
+WORKDIR /home/${DEV_USER}
 
-RUN mkdir /home/dev/git
+RUN sed -i 's/\\h/docker/;s/01;32m/01;33m/' /home/${DEV_USER}/.bashrc \
+  && mkdir /home/${DEV_USER}/git

docker/README.md

@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+DOCKER_BUILDKIT=1 docker -l debug build \
+    --target cpp-docker-ci \
+    -t cppcienv:latest .

docker/build-ci-image.sh

@@ -0,0 +1,6 @@
+#!/bin/bash -e
+
+DOCKER_BUILDKIT=1 docker -l debug build \
+    --target cpp-docker-dev \
+    --build-arg DEV_USER=dev \
+    -t cppdevenv:latest .

docker/build-dev-image.sh

@@ -10,5 +10,5 @@ if [ $# -ne 0 ]; then
   docker exec -i -t -u dev:dev "${CONTAINER}" bash -c "if [ -d \"${WORKDIR}\" ]; then cd ${WORKDIR}; fi; $*"
 else
   # (The shell is interactive if bash is called without arguments :)
-  docker exec -i -t -u dev:dev "${CONTAINER}" bash 
+  docker exec -i -t -u dev:dev "${CONTAINER}" bash -c "if [ -d \"${WORKDIR}\" ]; then cd ${WORKDIR}; fi; bash"
 fi

docker/build-image.sh

@@ -8,7 +8,7 @@ services:
     cap_add:
       - SYS_PTRACE
     container_name: cpp_docker_env
-    image: cppenv:latest
+    image: cppdevenv:latest
     environment:
         - TERM=xterm-256color # For a colored Terminal
         - SSH_AUTH_SOCK=/ssh-agent