Extend development environment base image (#24)

* Extend development environment base image Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de> * Remove sudo usage and pin curl and ca-certificates Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de> * Bump openjdk version Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de> --------- Signed-off-by: Andreas Heinrich <andreas.heinrich@rwth-aachen.de>
EVerest · Aug 7, 2024 · 4d841db · 4d841db
1 parent 3e406df
commit 4d841db
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/docker/images/dev-env-base/Dockerfile b/docker/images/dev-env-base/Dockerfile
@@ -24,13 +24,35 @@ RUN apt update \
     graphviz=2.42.2-7+b3 \
     build-essential=12.9 \
     cppcheck=2.10-2 \
-    bash-completion=1:2.11-6
+    bash-completion=1:2.11-6 \
+    vim=2:9.0.1378-2 \
+    # Development Tools - Debugging
+    gdb=13.1-3 \
+    nmap=7.93+dfsg1-1
 # Development Tools - Documentation
 RUN python3 -m pip install --break-system-packages \
     # language server RST/Sphinx
     esbonio==0.16.4 \
     # Style checker for RST/Sphinx
     doc8==1.1.1
+# Development Tools - Docker
+RUN apt update && apt install -y --no-install-recommends \
+    ca-certificates=20230311 \
+    curl=7.88.1-10+deb12u6 \
+    && install -m 0755 -d /etc/apt/keyrings \
+    && curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc \
+    && chmod a+r /etc/apt/keyrings/docker.asc \
+    && echo \
+    "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian \
+    $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+    tee /etc/apt/sources.list.d/docker.list > /dev/null \
+    && apt update \
+    && apt install -y --no-install-recommends \
+    docker-ce=5:27.0.3-1~debian.12~bookworm \
+    docker-ce-cli=5:27.1.1-1~debian.12~bookworm \
+    containerd.io=1.7.19-1 \
+    docker-buildx-plugin=0.16.1-1~debian.12~bookworm \
+    docker-compose-plugin=2.29.1-1~debian.12~bookworm
 
 RUN apt clean \
     && rm -rf /var/lib/apt/lists/*
@@ -41,4 +63,6 @@ RUN mkdir ~/.ssh \
     && ssh-keyscan github.com > ~/.ssh/known_hosts
 
 ENV PATH="/home/$USERNAME/.local/bin:$PATH"
-ENV CPM_SOURCE_CACHE="/home/$USERNAME/.cache/CPM"
+
+# Create cache directory for cpm to avoid permission issues
+RUN mkdir -p ${HOME}/.cache/cpm
diff --git a/docker/images/run-env-base/Dockerfile b/docker/images/run-env-base/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:12-slim
 
 RUN apt update \
     && apt install --no-install-recommends -y \
-    openjdk-17-jre=17.0.11+9-1~deb12u1 \
+    openjdk-17-jre=17.0.12+7-2~deb12u1 \
     nodejs=18.19.0+dfsg-6~deb12u2 \
     npm=9.2.0~ds1-1 \
     python3-pip=23.0.1+dfsg-1 \