fix(debian) Add missing packages to allow git cloning by ssh

mape2k · Nov 16, 2022 · e8a6599 · e8a6599
1 parent 70c7dba
commit e8a6599
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/11/bullseye/Dockerfile b/11/bullseye/Dockerfile
@@ -46,14 +46,19 @@ RUN groupadd -g "${gid}" "${group}" \
 
 ARG AGENT_WORKDIR=/home/${user}/agent
 
-## Always use the latest Alpine packages: no need for versions
+## Always use the latest Debian packages: no need for versions
 # hadolint ignore=DL3008
 RUN apt-get update \
   && apt-get --yes --no-install-recommends install \
-    git-lfs \
-    curl \
-    ca-certificates \
-    fontconfig \
+     ca-certificates \
+     curl \
+     fontconfig \
+     git \
+     git-lfs \
+     less \
+     netbase \
+     openssh-client \
+     patch \
   && rm -rf /var/lib/apt/lists/*
 
 ARG VERSION=3071.v7e9b_0dc08466

diff --git a/17/bullseye/Dockerfile b/17/bullseye/Dockerfile
@@ -60,10 +60,15 @@ ARG AGENT_WORKDIR=/home/"${user}"/agent
 # hadolint ignore=DL3008
 RUN apt-get update \
   && apt-get --yes --no-install-recommends install \
-    git-lfs \
-    curl \
     ca-certificates \
+    curl \
     fontconfig \
+    git \
+    git-lfs \
+    less \
+    netbase \
+    openssh-client \
+    patch \
   && rm -rf /var/lib/apt/lists/*
 
 ARG VERSION=3071.v7e9b_0dc08466

diff --git a/tests/tests.bats b/tests/tests.bats
@@ -32,7 +32,7 @@ ARCH=${ARCH:-x86_64}
   assert_equal "${output}" "UTF-8"
 }
 
-@test "[${SUT_IMAGE}] image has bash, curl and java installed and in the PATH" {
+@test "[${SUT_IMAGE}] image has bash, curl, ssh and java installed and in the PATH" {
   local cid
   cid="$(docker run -d -it -P "${SUT_IMAGE}" /bin/bash)"
 
@@ -45,13 +45,18 @@ ARCH=${ARCH:-x86_64}
 
   run docker exec "${cid}" sh -c "command -v curl"
   assert_success
-  run docker exec "${cid}" sh -c "curl --version"
+  run docker exec "${cid}" curl --version
   assert_success
 
   run docker exec "${cid}" sh -c "command -v java"
   assert_success
 
-  run docker exec "${cid}" sh -c "java -version"
+  run docker exec "${cid}" java -version
+  assert_success
+
+  run docker exec "${cid}" sh -c "command -v ssh"
+  assert_success
+  run docker exec "${cid}" ssh -V
   assert_success
 
   run docker exec "${cid}" sh -c "printenv | grep AGENT_WORKDIR"