Merge pull request #134 from magento/MAGECLOUD-5101

MAGECLOUD-5101: Forward-port 1.0 branch

Author: shiftedreality

composer.json

@@ -12,11 +12,11 @@
         "ext-json": "*",
         "composer/composer": "^1.0",
         "composer/semver": "^1.0",
-        "illuminate/config": "^5.6",
-        "illuminate/filesystem": "^5.6",
-        "symfony/config": "^3.4||^4.0",
-        "symfony/console": "^2.3||^4.0",
-        "symfony/dependency-injection": "^3.1||^4.0",
+        "illuminate/config": "^5.5",
+        "illuminate/filesystem": "^5.5",
+        "symfony/config": "^4.4",
+        "symfony/console": "^2.8||^4.0",
+        "symfony/dependency-injection": "^3.3||^4.3",
         "symfony/yaml": "^3.3||^4.0"
     },
     "require-dev": {

dist/bin/magento-docker

@@ -12,9 +12,10 @@ USAGE="Magento Cloud Docker
   stop              stop containers
   start             start containers
   restart           restart containers
-  ece-build         build application
-  ece-deploy        deploy application
-  ece-redeploy      re-build and re-deploy application
+  ece-build         run build hooks
+  ece-deploy        run deploy hooks
+  ece-post-deploy   run post-deploy hooks
+  ece-redeploy      run build, deploy, and post-deploy hooks
 
 \033[33mOptions:\033[0m
   -h            show this help text\n"

images/php/7.1-cli/docker-entrypoint.sh

@@ -30,10 +30,17 @@ fi
 # Ensure our Magento directory exists
 mkdir -p $MAGENTO_ROOT
 
+CRON_LOG=/var/log/cron.log
+
 if [ ! -z "${CRONTAB}" ]; then
     echo "${CRONTAB}" > /etc/cron.d/magento
 fi
 
+# Get rsyslog running for cron output
+touch $CRON_LOG
+echo "cron.* $CRON_LOG" > /etc/rsyslog.d/cron.conf
+service rsyslog start
+
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
     /etc/init.d/sendmail start

images/php/7.2-cli/docker-entrypoint.sh

@@ -30,10 +30,17 @@ fi
 # Ensure our Magento directory exists
 mkdir -p $MAGENTO_ROOT
 
+CRON_LOG=/var/log/cron.log
+
 if [ ! -z "${CRONTAB}" ]; then
     echo "${CRONTAB}" > /etc/cron.d/magento
 fi
 
+# Get rsyslog running for cron output
+touch $CRON_LOG
+echo "cron.* $CRON_LOG" > /etc/rsyslog.d/cron.conf
+service rsyslog start
+
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
     /etc/init.d/sendmail start

images/php/7.3-cli/docker-entrypoint.sh

@@ -30,10 +30,17 @@ fi
 # Ensure our Magento directory exists
 mkdir -p $MAGENTO_ROOT
 
+CRON_LOG=/var/log/cron.log
+
 if [ ! -z "${CRONTAB}" ]; then
     echo "${CRONTAB}" > /etc/cron.d/magento
 fi
 
+# Get rsyslog running for cron output
+touch $CRON_LOG
+echo "cron.* $CRON_LOG" > /etc/rsyslog.d/cron.conf
+service rsyslog start
+
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
     /etc/init.d/sendmail start

images/php/cli/docker-entrypoint.sh

@@ -30,10 +30,17 @@ fi
 # Ensure our Magento directory exists
 mkdir -p $MAGENTO_ROOT
 
+CRON_LOG=/var/log/cron.log
+
 if [ ! -z "${CRONTAB}" ]; then
     echo "${CRONTAB}" > /etc/cron.d/magento
 fi
 
+# Get rsyslog running for cron output
+touch $CRON_LOG
+echo "cron.* $CRON_LOG" > /etc/rsyslog.d/cron.conf
+service rsyslog start
+
 # Configure Sendmail if required
 if [ "$ENABLE_SENDMAIL" == "true" ]; then
     /etc/init.d/sendmail start

src/Compose/BuilderInterface.php

@@ -53,7 +53,6 @@ interface BuilderInterface
     public const VOLUME_MAGENTO_MEDIA = 'magento-media';
     public const VOLUME_MAGENTO_DB = 'magento-db';
     public const VOLUME_MAGENTO_DEV = 'magento-dev';
-    public const VOLUME_DOCKER_TMP = 'docker-tmp';
     public const VOLUME_DOCKER_MNT = 'docker-mnt';
 
     /**

src/Compose/ProductionBuilder.php

@@ -174,13 +174,6 @@ public function build(Repository $config): Manager
         }
 
         if ($this->getMountVolumes($config)) {
-            $volumes[self::VOLUME_DOCKER_TMP] = [
-                'driver_opts' => [
-                    'type' => 'none',
-                    'device' => $rootPath . '/.docker/tmp',
-                    'o' => 'bind'
-                ]
-            ];
             $volumes[self::VOLUME_DOCKER_MNT] = [
                 'driver_opts' => [
                     'type' => 'none',
@@ -532,7 +525,6 @@ private function getMountVolumes(Repository $config): array
 
         return [
             self::VOLUME_DOCKER_MNT . ':/mnt',
-            self::VOLUME_DOCKER_TMP . ':/tmp'
         ];
     }
 }