From 2661a1a38f29909e40cdbbc9d90437ff0a71ed52 Mon Sep 17 00:00:00 2001 From: Alex Skrypnyk Date: Tue, 14 May 2019 13:32:56 +1000 Subject: [PATCH] Fixed COMPOSER_MEMORY_LIMIT in CLI container + Drupal core update. (#16) * Update Drupal to 8.6.16 * Fix wrong constraint for hotfix branch * Added unlimited COMPOSER_MEMORY_LIMIT to CLI container. * Update composer.json to release versions of tide --- composer.dev.json | 2 +- composer.json | 4 ++-- docker-compose.yml | 1 + scripts/drupal-init-module.sh | 2 ++ 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/composer.dev.json b/composer.dev.json index d5774f3..8066d71 100644 --- a/composer.dev.json +++ b/composer.dev.json @@ -6,7 +6,7 @@ "composer/installers": "^1.2.0", "cweagans/composer-patches": "^1.6.0", "drupal-composer/drupal-scaffold": "^2.3", - "drupal/core": "8.6.12", + "drupal/core": "8.6.16", "drush/drush": "^8.1", "vlucas/phpdotenv": "^2.4", "webflo/drupal-finder": "^1.0" diff --git a/composer.json b/composer.json index fa2e0db..d14aaa9 100644 --- a/composer.json +++ b/composer.json @@ -4,9 +4,9 @@ "license": "GPL-2.0-or-later", "type": "drupal-module", "require": { - "dpc-sdp/tide_core": "^1.0" + "dpc-sdp/tide_core": "1.2.0" }, "suggest": { - "dpc-sdp/tide_media:^1.0": "Media and related configuration for Tide Drupal 8 distribution" + "dpc-sdp/tide_media:1.2.1": "Media and related configuration for Tide Drupal 8 distribution" } } diff --git a/docker-compose.yml b/docker-compose.yml index 0e0a2a0..83b32e2 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -53,6 +53,7 @@ services: image: *project environment: << : *default-environment + COMPOSER_MEMORY_LIMIT: -1 << : *default-volumes volumes_from: ### Local overrides to mount host SSH keys. Automatically removed in CI. - container:amazeeio-ssh-agent ### Local overrides to mount host SSH keys. Automatically removed in CI. diff --git a/scripts/drupal-init-module.sh b/scripts/drupal-init-module.sh index 53eca6e..871ae32 100755 --- a/scripts/drupal-init-module.sh +++ b/scripts/drupal-init-module.sh @@ -16,6 +16,8 @@ WEBROOT=${WEBROOT:-docroot} TEST_PACKAGE_NAME=${TEST_PACKAGE_NAME:-tide_test} TEST_PACKAGE_VERSION=${TEST_PACKAGE_VERSION:-^1.0} +echo "==> COMPOSER_MEMORY_LIMIT=$COMPOSER_MEMORY_LIMIT" + # Extract module name from the *.info.yml file, if not provided. if [ "$PACKAGE_NAME" == "" ]; then PACKAGE_NAME=$(find * -maxdepth 0 -name '*.info.yml'|cut -d. -f1)