Merge pull request #181 from gounthar/adding-explicitely-less-and-patch

chore(linux) Add `less` and `patch` packages explicitly and a test to validate the installation

Author: dduportal

11/alpine/Dockerfile

@@ -40,8 +40,10 @@ RUN mkdir -p "${JENKINS_AGENT_HOME}/.ssh/" \
 RUN apk add --no-cache \
     bash \
     git-lfs \
+    less \
     netcat-openbsd \
-    openssh
+    openssh \
+    patch
 
 # setup SSH server
 RUN sed -i /etc/ssh/sshd_config \

11/bullseye/Dockerfile

@@ -47,8 +47,10 @@ RUN groupadd -g ${gid} ${group} \
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
        git-lfs \
+       less \
        netcat-traditional \
        openssh-server \
+       patch \
     && rm -rf /var/lib/apt/lists/*
 
 # setup SSH server

17/alpine/Dockerfile

@@ -40,8 +40,10 @@ RUN mkdir -p "${JENKINS_AGENT_HOME}/.ssh/" \
 RUN apk add --no-cache \
     bash \
     git-lfs \
+    less \
     netcat-openbsd \
-    openssh
+    openssh \
+    patch
 
 # setup SSH server
 RUN sed -i /etc/ssh/sshd_config \

17/bullseye/Dockerfile

@@ -25,8 +25,10 @@ RUN groupadd -g ${gid} ${group} \
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
        git-lfs \
+       less \
        netcat-traditional \
        openssh-server \
+       patch \
     && rm -rf /var/lib/apt/lists/*
 
 # setup SSH server

8/alpine/Dockerfile

@@ -40,8 +40,10 @@ RUN mkdir -p "${JENKINS_AGENT_HOME}/.ssh/" \
 RUN apk add --no-cache \
     bash \
     git-lfs \
+    less \
     netcat-openbsd \
-    openssh
+    openssh \
+    patch
 
 # setup SSH server
 RUN sed -i /etc/ssh/sshd_config \

8/bullseye/Dockerfile

@@ -37,9 +37,11 @@ RUN groupadd -g ${gid} ${group} \
 
 RUN apt-get update \
     && apt-get install --no-install-recommends -y \
-       git-lfs  \
+       git-lfs \
+       less \
        netcat-traditional \
        openssh-server \
+       patch \
     && rm -rf /var/lib/apt/lists/*
 
 # setup SSH server

tests/tests.bats

@@ -189,7 +189,7 @@ DOCKER_PLUGIN_DEFAULT_ARG="/usr/sbin/sshd -D -p 22"
 }
 
 
-@test "[${SUT_IMAGE}] image has git and SSH client installed and present in the PATH" {
+@test "[${SUT_IMAGE}] image has required tools installed and present in the PATH" {
   local test_container_name=${AGENT_CONTAINER}-bash-java
   clean_test_container "${test_container_name}"
   docker run --name="${test_container_name}" --name="${test_container_name}" "${docker_run_opts[@]}" "${PUBLIC_SSH_KEY}"
@@ -204,5 +204,14 @@ DOCKER_PLUGIN_DEFAULT_ARG="/usr/sbin/sshd -D -p 22"
   run docker exec "${test_container_name}" git --version
   assert_success
 
+  run docker exec "${test_container_name}" sh -c "command -v less"
+  assert_success
+  run docker exec "${test_container_name}" less -V
+  assert_success
+  run docker exec "${test_container_name}" sh -c "command -v patch"
+  assert_success
+  run docker exec "${test_container_name}" patch --version
+  assert_success
+
   clean_test_container "${test_container_name}"
 }