Merge pull request laradock#2840 from vlauciani/master

bestlong · web-flow · commit 3a73aa60eeb4 · 2021-02-10T22:29:42.000+08:00
Install 'docker' client into 'php-fpm' and 'workspace' docker image
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -163,6 +163,7 @@ services:
           - INSTALL_LNAV=${WORKSPACE_INSTALL_LNAV}
           - INSTALL_PROTOC=${WORKSPACE_INSTALL_PROTOC}
           - PROTOC_VERSION=${WORKSPACE_PROTOC_VERSION}
+          - INSTALL_DOCKER_CLIENT=${WORKSPACE_INSTALL_DOCKER_CLIENT}
           - http_proxy
           - https_proxy
           - no_proxy
@@ -263,6 +264,7 @@ services:
           - PHP_FPM_NEW_RELIC=${PHP_FPM_NEW_RELIC}
           - PHP_FPM_NEW_RELIC_KEY=${PHP_FPM_NEW_RELIC_KEY}
           - PHP_FPM_NEW_RELIC_APP_NAME=${PHP_FPM_NEW_RELIC_APP_NAME}
+          - INSTALL_DOCKER_CLIENT=${PHP_FPM_INSTALL_DOCKER_CLIENT}
           - http_proxy
           - https_proxy
           - no_proxy
diff --git a/env-example b/env-example
@@ -191,6 +191,7 @@ WORKSPACE_VUE_CLI_SERVE_HOST_PORT=8080
 WORKSPACE_VUE_CLI_UI_HOST_PORT=8001
 WORKSPACE_ANGULAR_CLI_SERVE_HOST_PORT=4200
 WORKSPACE_INSTALL_GIT_PROMPT=false
+WORKSPACE_INSTALL_DOCKER_CLIENT=false
 WORKSPACE_INSTALL_LNAV=false
 WORKSPACE_INSTALL_PROTOC=false
 WORKSPACE_PROTOC_VERSION=latest
@@ -253,6 +254,7 @@ PHP_FPM_INSTALL_WKHTMLTOPDF=false
 PHP_FPM_FFMPEG=false
 PHP_FPM_AUDIOWAVEFORM=false
 PHP_FPM_ADDITIONAL_LOCALES="en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8"
+PHP_FPM_INSTALL_DOCKER_CLIENT=false
 PHP_FPM_DEFAULT_LOCALE=POSIX
 
 PHP_FPM_PUID=1000
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
@@ -862,6 +862,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:
 ###########################################################################
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
@@ -1324,6 +1324,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
 ###########################################################################
