Upgrade to Drupal 8.9.9 and Composer 2

codingdavinci · Nov 23, 2020 · 034871d · 034871d
1 parent bf7fc75
commit 034871d
Show file tree

Hide file tree

Showing 3 changed files with 472 additions and 807 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM composer:1.10 AS COMPOSER_CHAIN
+FROM composer:2 AS COMPOSER_CHAIN
 MAINTAINER Michael Büchner <m.buechner@dnb.de>
 RUN apk add --no-cache libpng libpng-dev libjpeg-turbo-dev libwebp-dev zlib-dev libxpm-dev
 RUN docker-php-ext-install gd

diff --git a/composer.json b/composer.json
@@ -28,8 +28,7 @@
         "drupal/block_exclude_pages": "^1.2",
         "drupal/blockgroup": "^1.1",
         "drupal/config_installer": "^1.8",
-        "drupal/console": "~1.0",
-        "drupal/core-composer-scaffold": "^8.8",
+        "drupal/core-composer-scaffold": "^9.0.7",
         "drupal/core-recommended": "^8.9",
         "drupal/db_maintenance": "^1.4",
         "drupal/eu_cookie_compliance": "^1.8",
@@ -66,7 +65,7 @@
         "npm-asset/select2": "^4.0",
         "npm-asset/typeface-barlow": "*",
         "npm-asset/waypoints": "^4.0",
-        "oomphinc/composer-installers-extender": "^1.1",
+        "oomphinc/composer-installers-extender": "^2.0.0",
         "vlucas/phpdotenv": "^2.4",
         "webflo/drupal-finder": "^1.0.0",
         "webmozart/path-util": "^2.3"