Fixed missing SSH agent forwarding and extra_hosts entries on php-bla…

…ckfire container Related to wardenenv#145
theuargb · May 13, 2020 · 7a22fd1 · 7a22fd1
1 parent c776ce3
commit 7a22fd1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,11 @@
 * Updated `php-fpm` images to use `fpm-loaders` variant of base image to include IonCube & SourceGuardian from upstream images
 * Updated `php-fpm` images fix for directory ownership of mounted volume paths for future flexibility by moving it to the `docker-entrypoint` script with an env var `CHOWN_DIR_LIST` to specify what directories to chown on container startup
 
+**Bug Fixes:**
+
+* Fixed missing SSH agent forwarding in `php-blackfire` container
+* Fixed lack of `extra_hosts` in `php-blackfire` and `blackfire-agent` containers (issue [#145](https://github.com/davidalger/warden/issues/145))
+
 ## Version [0.4.3](https://github.com/davidalger/warden/tree/0.4.3) (2020-05-02)
 [All Commits](https://github.com/davidalger/warden/compare/0.4.2..0.4.3)
 

diff --git a/environments/magento2/magento2.blackfire.base.yml b/environments/magento2/magento2.blackfire.base.yml
@@ -3,6 +3,14 @@ services:
   php-blackfire:
     hostname: "${WARDEN_ENV_NAME}-php-blackfire"
     image: quay.io/warden/php-fpm:${PHP_VERSION:-7.3}-magento2-blackfire
+    environment:
+      - TRAEFIK_DOMAIN
+      - TRAEFIK_SUBDOMAIN
+      - SSH_AUTH_SOCK=/tmp/ssh-auth.sock
+      - NODE_VERSION=${NODE_VERSION:-10}
+    extra_hosts:
+      - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
+      - ${TRAEFIK_SUBDOMAIN:-app}.${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
     depends_on:
       - php-fpm
 
@@ -14,3 +22,6 @@ services:
       - BLACKFIRE_CLIENT_TOKEN=${BLACKFIRE_CLIENT_TOKEN}
       - BLACKFIRE_SERVER_ID=${BLACKFIRE_SERVER_ID}
       - BLACKFIRE_SERVER_TOKEN=${BLACKFIRE_SERVER_TOKEN}
+    extra_hosts:
+      - ${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
+      - ${TRAEFIK_SUBDOMAIN:-app}.${TRAEFIK_DOMAIN}:${TRAEFIK_ADDRESS:-0.0.0.0}
diff --git a/environments/magento2/magento2.blackfire.darwin.yml b/environments/magento2/magento2.blackfire.darwin.yml
@@ -4,6 +4,7 @@ services:
     volumes:
       - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
       - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer:delegated
+      - /run/host-services/ssh-auth.sock:/run/host-services/ssh-auth.sock
       - .${WARDEN_WEB_ROOT:-}/pub/media:/var/www/html/pub/media:delegated
       - appdata:/var/www/html
 

diff --git a/environments/magento2/magento2.blackfire.linux-gnu.yml b/environments/magento2/magento2.blackfire.linux-gnu.yml
@@ -4,4 +4,5 @@ services:
     volumes:
       - ${WARDEN_SSL_DIR}/rootca/certs:/etc/ssl/warden-rootca-cert:ro
       - ${WARDEN_COMPOSER_DIR}:/home/www-data/.composer
+      - ${SSH_AUTH_SOCK:-/dev/null}:/run/host-services/ssh-auth.sock
       - .${WARDEN_WEB_ROOT:-}/:/var/www/html