MCLOUD-6008: Include ssh client to make use of ssh-agent forwarding for composer (#215)

Author: keithbentrup

dist/bin/magento-docker

@@ -85,7 +85,15 @@ case "$1" in
     php)
         version="$2"
         shift 2
-        docker run --rm -it -e "MAGENTO_ROOT=/app" -v "$(pwd)":/app -v ~/.composer/cache:/root/.composer/cache "magento/magento-cloud-docker-php:${version}-cli" "$@"
+        # allow ssh-agent forwarding for composer.json files that need access to private repos
+        if [[ $(uname) = Darwin ]]; then
+            # https://docs.docker.com/docker-for-mac/osxfs/#ssh-agent-forwarding (D4M > 2.2)
+            export SSH_AUTH_SOCK="/run/host-services/ssh-auth.sock"
+        fi
+        docker run --rm -it -e "MAGENTO_ROOT=/app" -v "$(pwd)":/app -v ~/.composer/cache:/root/.composer/cache \
+            --mount "type=bind,src=$HOME/.ssh/known_hosts,target=/root/.ssh/known_hosts" \
+            --mount "type=bind,src=$SSH_AUTH_SOCK,target=$SSH_AUTH_SOCK" -e SSH_AUTH_SOCK="$SSH_AUTH_SOCK" \
+            "magento/magento-cloud-docker-php:${version}-cli-1.1" "$@"
         ;;
     *)
         printf "$USAGE"

images/php/7.2-cli/Dockerfile

@@ -34,6 +34,7 @@ RUN apt-get update \
   sudo \
   unzip \
   vim \
+  openssh-client \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \

images/php/7.3-cli/Dockerfile

@@ -34,6 +34,7 @@ RUN apt-get update \
   sudo \
   unzip \
   vim \
+  openssh-client \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \

images/php/7.4-cli/Dockerfile

@@ -34,6 +34,7 @@ RUN apt-get update \
   sudo \
   unzip \
   vim \
+  openssh-client \
   libbz2-dev \
   libjpeg62-turbo-dev \
   libpng-dev \

src/Command/Image/GeneratePhp.php

@@ -53,6 +53,7 @@ class GeneratePhp extends Command
         'sudo',
         'unzip',
         'vim',
+        'openssh-client',
     ];
 
     private const PHP_EXTENSIONS_ENABLED_BY_DEFAULT = [