Merge branch 'release/3.6.0'

Author: pingers

RoboFileBase.php

@@ -152,13 +152,15 @@ protected function readConfigFromEnv() {
    */
   public function build() {
     $start = new DateTime();
+    $this->devXdebugDisable();
     $this->devComposerValidate();
     $this->buildMake();
     $this->buildSetFilesOwner();
     $this->buildInstall();
     $this->configImportPlus();
     $this->devCacheRebuild();
     $this->buildSetFilesOwner();
+    $this->devXdebugEnable();
     $this->say('Total build duration: ' . date_diff(new DateTime(), $start)->format('%im %Ss'));
   }
 

docker-compose.linux.yml

@@ -35,6 +35,7 @@ services:
       SITE_ADMIN_EMAIL: [email protected]
       SITE_ADMIN_USERNAME: admin
       SITE_ADMIN_PASSWORD: password
+      SSH_AUTH_SOCK: /ssh/ssh
       VIRTUAL_HOST: ${PROJECT}.${DOMAIN}
       # Do not define this as '/' or apache2 will give strange behaviour, to test locally,
       # change to the web directory and create a symlink to the subpath name eg ln -s . subpath