From 2598164e95c06a7cc87bd547623fa551b7dc8b60 Mon Sep 17 00:00:00 2001 From: Michael Casey Date: Tue, 14 Jan 2020 14:30:25 -0600 Subject: [PATCH 1/5] Update magento-docker command usage Update help to include post-deploy commands. --- dist/bin/magento-docker | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dist/bin/magento-docker b/dist/bin/magento-docker index de51d893..2b2872c0 100644 --- a/dist/bin/magento-docker +++ b/dist/bin/magento-docker @@ -14,7 +14,8 @@ USAGE="Magento Cloud Docker restart restart containers ece-build build application ece-deploy deploy application - ece-redeploy re-build and re-deploy application + ece-post-deploy run post-deploy hooks + ece-redeploy re-build, re-deploy, and run post-deploy \033[33mOptions:\033[0m -h show this help text\n" From d39f6aef650967b1159665fe0dd7331a7fa2549d Mon Sep 17 00:00:00 2001 From: Michael Casey Date: Tue, 14 Jan 2020 14:55:52 -0600 Subject: [PATCH 2/5] Make magento-docker usage text consistent Makes the magento-docker command usage text more consistent with regards to the deploy process. --- dist/bin/magento-docker | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dist/bin/magento-docker b/dist/bin/magento-docker index 2b2872c0..37c5d8d9 100644 --- a/dist/bin/magento-docker +++ b/dist/bin/magento-docker @@ -12,10 +12,10 @@ USAGE="Magento Cloud Docker stop stop containers start start containers restart restart containers - ece-build build application - ece-deploy deploy application + ece-build run build hooks + ece-deploy run deploy hooks ece-post-deploy run post-deploy hooks - ece-redeploy re-build, re-deploy, and run post-deploy + ece-redeploy run build, deploy, and post-deploy hooks \033[33mOptions:\033[0m -h show this help text\n" From 1e73c8edfbebb733ecb7d02353391879bda6df30 Mon Sep 17 00:00:00 2001 From: Ben Batschelet Date: Fri, 17 Jan 2020 10:23:57 -0600 Subject: [PATCH 3/5] MAGECLOUD-4979: Cleanup Composer Dependencies (#121) MAGECLOUD-4979: Cleanup Composer Dependencies (#121) --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 97001a9c..1025a4f9 100644 --- a/composer.json +++ b/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": { From 566b4e7fbfb438331f635c36bce48ac34892a59a Mon Sep 17 00:00:00 2001 From: Oleg Posyniak Date: Tue, 21 Jan 2020 15:17:54 -0600 Subject: [PATCH 4/5] MAGECLOUD-5063: Cron container stops after starting on 1.0 images (#133) - This fixes #132 --- images/php/7.1-cli/docker-entrypoint.sh | 7 +++++++ images/php/7.2-cli/docker-entrypoint.sh | 7 +++++++ images/php/7.3-cli/docker-entrypoint.sh | 7 +++++++ images/php/cli/docker-entrypoint.sh | 7 +++++++ src/Compose/ProductionBuilder.php | 9 +-------- 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/images/php/7.1-cli/docker-entrypoint.sh b/images/php/7.1-cli/docker-entrypoint.sh index f897f2b4..dce3a429 100644 --- a/images/php/7.1-cli/docker-entrypoint.sh +++ b/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 diff --git a/images/php/7.2-cli/docker-entrypoint.sh b/images/php/7.2-cli/docker-entrypoint.sh index f897f2b4..dce3a429 100644 --- a/images/php/7.2-cli/docker-entrypoint.sh +++ b/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 diff --git a/images/php/7.3-cli/docker-entrypoint.sh b/images/php/7.3-cli/docker-entrypoint.sh index f897f2b4..dce3a429 100644 --- a/images/php/7.3-cli/docker-entrypoint.sh +++ b/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 diff --git a/images/php/cli/docker-entrypoint.sh b/images/php/cli/docker-entrypoint.sh index f897f2b4..dce3a429 100755 --- a/images/php/cli/docker-entrypoint.sh +++ b/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 diff --git a/src/Compose/ProductionBuilder.php b/src/Compose/ProductionBuilder.php index b50f3c8c..051b344d 100644 --- a/src/Compose/ProductionBuilder.php +++ b/src/Compose/ProductionBuilder.php @@ -462,13 +462,6 @@ private function getVolumesDefinition(): array } if (!$this->config->get(self::KEY_NO_TMP_MOUNTS)) { - $volumes['docker-tmp'] = [ - 'driver_opts' => [ - 'type' => 'none', - 'device' => $rootPath . '/.docker/tmp', - 'o' => 'bind' - ] - ]; $volumes['docker-mnt'] = [ 'driver_opts' => [ 'type' => 'none', @@ -618,7 +611,7 @@ private function getDockerMount(): array return []; } - return ['docker-mnt:/mnt', 'docker-tmp:/tmp']; + return ['docker-mnt:/mnt']; } /** From a346fe94f86cf0969596f6b1be44ecec7f6914dd Mon Sep 17 00:00:00 2001 From: Oleh Posyniak Date: Fri, 24 Jan 2020 13:34:12 -0600 Subject: [PATCH 5/5] MAGECLOUD-5101: Forward-port 1.0 branch --- src/Compose/BuilderInterface.php | 1 - src/Compose/ProductionBuilder.php | 8 -------- 2 files changed, 9 deletions(-) diff --git a/src/Compose/BuilderInterface.php b/src/Compose/BuilderInterface.php index 8d229c24..070c4741 100644 --- a/src/Compose/BuilderInterface.php +++ b/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'; /** diff --git a/src/Compose/ProductionBuilder.php b/src/Compose/ProductionBuilder.php index 9bc7422f..4dd3749c 100644 --- a/src/Compose/ProductionBuilder.php +++ b/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' ]; } }