From a6950d2e6fda085210cc35abfd9dd65e42cf8eef Mon Sep 17 00:00:00 2001
From: Valentino Lauciani <vlauciani@gmail.com>
Date: Tue, 9 Feb 2021 13:13:14 +0100
Subject: [PATCH 1/4] Add variable to install docker client

---
 docker-compose.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index f73640b8..346c215c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -141,6 +141,7 @@ services:
           - INSTALL_SUPERVISOR=${WORKSPACE_INSTALL_SUPERVISOR}
           - INSTALL_FFMPEG=${WORKSPACE_INSTALL_FFMPEG}
           - INSTALL_GNU_PARALLEL=${WORKSPACE_INSTALL_GNU_PARALLEL}
+          - INSTALL_DOCKER_CLIENT=${WORKSPACE_INSTALL_DOCKER_CLIENT}
           - http_proxy
           - https_proxy
           - no_proxy
@@ -228,6 +229,7 @@ services:
           - PUID=${PHP_FPM_PUID}
           - PGID=${PHP_FPM_PGID}
           - LOCALE=${PHP_FPM_DEFAULT_LOCALE}
+          - INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
           - http_proxy
           - https_proxy
           - no_proxy

From ffc36b7ec82960a3f4614416758489f61f70d0af Mon Sep 17 00:00:00 2001
From: Valentino Lauciani <vlauciani@gmail.com>
Date: Tue, 9 Feb 2021 13:14:27 +0100
Subject: [PATCH 2/4] Add variable to install docker client

---
 env-example | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/env-example b/env-example
index e6cb581a..e5369ca8 100644
--- a/env-example
+++ b/env-example
@@ -160,6 +160,7 @@ WORKSPACE_INSTALL_GNU_PARALLEL=false
 WORKSPACE_INSTALL_AST=true
 WORKSPACE_AST_VERSION=1.0.3
 WORKSPACE_INSTALL_GIT_PROMPT=false
+WORKSPACE_INSTALL_DOCKER_CLIENT=false
 
 ### PHP_FPM ###############################################
 
@@ -215,6 +216,7 @@ PHP_FPM_INSTALL_SSHPASS=false
 PHP_FPM_INSTALL_MAILPARSE=false
 PHP_FPM_FFMPEG=false
 PHP_FPM_ADDITIONAL_LOCALES="es_ES.UTF-8 fr_FR.UTF-8"
+PHP_FPM_INSTALL_DOCKER_CLIENT=false
 PHP_FPM_DEFAULT_LOCALE=POSIX
 
 PHP_FPM_PUID=1000

From 88b4050c799fd5a6ddd2f2f9c3e5d27c26b233f8 Mon Sep 17 00:00:00 2001
From: Valentino Lauciani <vlauciani@gmail.com>
Date: Tue, 9 Feb 2021 13:17:08 +0100
Subject: [PATCH 3/4] Add code to install docker client into docker image

---
 php-fpm/Dockerfile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
index b3246ed9..be4762f4 100644
--- a/php-fpm/Dockerfile
+++ b/php-fpm/Dockerfile
@@ -837,6 +837,21 @@ RUN if [ ${INSTALL_SSHPASS} = true ]; then \
     apt-get -y install sshpass \
 ;fi
 
+###########################################################################
+# Docker Client:
+###########################################################################
+
+USER root
+
+ARG INSTALL_DOCKER_CLIENT=false
+
+RUN if [ ${INSTALL_DOCKER_CLIENT} = true ]; then \
+    curl -sS https://download.docker.com/linux/static/stable/x86_64/docker-20.10.3.tgz -o /tmp/docker.tar.gz && \
+    tar -xzf /tmp/docker.tar.gz -C /tmp/ && \
+    cp /tmp/docker/docker* /usr/local/bin && \
+    chmod +x /usr/local/bin/docker* \
+;fi
+
 ###########################################################################
 # FFMPEG:
 ###########################################################################

From a00364bf01af7b1c39f4007f79afc11b76bcb7a4 Mon Sep 17 00:00:00 2001
From: Valentino Lauciani <vlauciani@gmail.com>
Date: Tue, 9 Feb 2021 13:17:58 +0100
Subject: [PATCH 4/4] Add code to install docker client into docker image

---
 workspace/Dockerfile | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 267cc16d..e67a5a69 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -1208,6 +1208,21 @@ RUN if [ ${INSTALL_SSHPASS} = true ]; then \
     apt-get -y install sshpass \
 ;fi
 
+###########################################################################
+# Docker Client:
+###########################################################################
+
+USER root
+
+ARG INSTALL_DOCKER_CLIENT=false
+
+RUN if [ ${INSTALL_DOCKER_CLIENT} = true ]; then \
+    curl -sS https://download.docker.com/linux/static/stable/x86_64/docker-20.10.3.tgz -o /tmp/docker.tar.gz && \
+    tar -xzf /tmp/docker.tar.gz -C /tmp/ && \
+    cp /tmp/docker/docker* /usr/local/bin && \
+    chmod +x /usr/local/bin/docker* \
+;fi
+
 ###########################################################################
 # YAML: extension for PHP-CLI
 ###########################################################################