[WIP] Feature/satis build

.docker/Dockerfile.govcms8

@@ -7,16 +7,14 @@ ARG GOVCMS_PROJECT_VERSION
 ARG DRUPAL_CORE_VERSION
 
 COPY composer.* /app/
-
-RUN sed -i -e "/govcms\/govcms/ s!\^1.0!${GOVCMS_PROJECT_VERSION}!" /app/composer.json \
-    && sed -i -e "/drupal\/core-recommended/ s!\^8.8!${DRUPAL_CORE_VERSION}!" /app/composer.json
+COPY custom /app/custom
 
 COPY scripts/composer/ScriptHandler.php /app/scripts/composer/ScriptHandler.php
 
 ENV COMPOSER_MEMORY_LIMIT=-1
-RUN composer install -d /app \
+RUN composer install -d /app --no-dev --no-interaction --no-suggest \
 # Force drupal-scaffold to run to ensure that the needed files are always created, even if a composer.lock is provided
-    && composer drupal-scaffold \
+    && composer drupal:scaffold \
     && composer clearcache
 
 COPY .docker/sanitize.sh /app/sanitize.sh

.docker/Dockerfile.test

@@ -11,6 +11,8 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
 COPY --from=cli /app /app
+RUN composer require -d /app govcms/require-dev:~1
+
 COPY .docker/scripts/phpunit /app/web/profiles/contrib/govcms/.docker/phpunit
 COPY .docker/scripts/lint-govcms /app/web/profiles/contrib/govcms/.docker/scripts/lint-govcms
 

.env.default

@@ -43,9 +43,9 @@ SITE_AUDIT_VERSION=7.x-3.x
 # Set the version of GovCMS and Drupal Core to use - you can use a tag or branch reference (1.x-dev) here
 # Note: the DRUPAL_CORE_VERSION here must match the version required in the corresponding GOVCMS_PROJECT_VERSION
 # See https://github.com/govCMS/govcms8/releases
-GOVCMS_PROJECT_VERSION=release/1.1.0-dev
+GOVCMS_PROJECT_VERSION=1.1.1
 DRUPAL_CORE_VERSION=8.8.1
 
 # Set the Lagoon tag to use for the upstream dockerfiles (e.g. v1.2.0)
 # See https://github.com/amazeeio/lagoon/releases
-LAGOON_IMAGE_VERSION=v1.2.0
+LAGOON_IMAGE_VERSION=v1.3.1

composer.json

@@ -3,44 +3,22 @@
     "description": "Project template for GovCMS Drupal 8 projects with composer",
     "type": "project",
     "license": "GPL-2.0-or-later",
-    "repositories": [
-        {
-            "type": "composer",
-            "url": "https://packages.drupal.org/8"
-        },
-        {
-            "type": "composer",
-            "url": "https://asset-packagist.org"
-        },
-        {
-            "type": "vcs",
-            "url": "git@github.com:govcms/govcms8.git"
-        },
-        {
-            "type": "vcs",
-            "url": "git@github.com:govCMS/scaffold-tooling.git"
-        }
-    ],
+    "repositories": {
+        "govcms": { "type": "composer", "url": "https://satis.govcms.gov.au/" },
+        "whitelist": { "type": "composer", "url": "https://satis.govcms.gov.au/whitelist/" },
+        "custom": { "type": "path", "url": "custom/composer" },
+        "packagist.org": false
+    },
     "require": {
-        "composer/installers": "^1.2",
-        "cweagans/composer-patches": "^1.6.5",
-        "drupal-composer/drupal-scaffold": "^2.5",
-        "govcms/govcms": "^1.0",
-        "webflo/drupal-finder": "^1.0.0",
-        "webmozart/path-util": "^2.3",
-        "drupal/core-recommended": "^8.8",
-        "zaporylie/composer-drupal-optimizations": "^1.0",
-        "govcms/scaffold-tooling": "dev-feature/govcms-4390-sub-scripts-deploy"
+        "govcms/govcms": "~1",
+        "govcms/scaffold-tooling": "~1",
+        "govcms/custom": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.5"
     },
     "conflict": {
         "drupal/drupal": "*"
     },
-    "provide": {
-        "drupal/core": "*"
-    },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
@@ -63,24 +41,26 @@
         ],
         "post-update-cmd": [
             "DrupalProject\\composer\\ScriptHandler::createRequiredFiles"
-        ],
-        "drupal-scaffold": [
-            "DrupalComposer\\DrupalScaffold\\Plugin::scaffold"
         ]
     },
     "extra": {
+        "enable-patching": true,
+        "patches-file": "custom/composer/patches.json",
         "patchLevel": {
             "drupal/core": "-p2"
         },
-        "enable-patching": true,
-        "patches": {},
-        "installer-types": ["bower-asset", "npm-asset"],
+        "installer-types": [
+            "bower-asset",
+            "npm-asset"
+        ],
         "installer-paths": {
             "web/core": [
                 "type:drupal-core"
             ],
             "web/libraries/{$name}": [
-                "type:drupal-library", "type:bower-asset", "type:npm-asset"
+                "type:drupal-library",
+                "type:bower-asset",
+                "type:npm-asset"
             ],
             "web/modules/contrib/{$name}": [
                 "type:drupal-module"
@@ -102,4 +82,4 @@
             }
         }
     }
-}
+}

custom/composer/composer.json

@@ -0,0 +1,5 @@
+{
+    "name": "govcms/custom",
+    "description": "Additional packages from https://satis.govcms.gov.au or where composer.json is locked.",
+    "require": {}
+}

custom/composer/patches.json

@@ -0,0 +1,4 @@
+{
+    "patches": {
+    }
+  }