feat: saasplus image

.docker/Dockerfile.govcms-saasplus

@@ -0,0 +1,12 @@
+ARG GOVCMS_IMAGE
+
+FROM ${GOVCMS_IMAGE}
+
+ENV COMPOSER_MEMORY_LIMIT=-1
+
+# Add the custom packages repository and install SaaS+ modules.
+COPY custom /app/custom
+RUN --mount=type=secret,id=composer-auth,dst=/app/auth.json \
+    /usr/local/bin/composer config repositories.custom path custom/composer -d /app \
+    && /usr/local/bin/composer require --no-interaction --update-no-dev -d /app govcms/govcms-custom \
+    && /usr/local/bin/composer clearcache

bake.hcl

@@ -1,12 +1,17 @@
 group "default" {
-    targets = ["cli", "test", "nginx", "php", "mariadb", "redis", "solr", "varnish"]
+    targets = ["cli", "cli-saasplus", "test", "nginx", "php", "mariadb", "redis", "solr", "varnish"]
 }
 
 target "cli" {
     dockerfile = ".docker/Dockerfile.govcms"
     platforms = ["linux/amd64", "linux/arm64"]
 }
 
+target "cli-saasplus" {
+    dockerfile = ".docker/Dockerfile.govcms-saasplus"
+    platforms = ["linux/amd64", "linux/arm64"]
+}
+
 target "test" {
     dockerfile = ".docker/Dockerfile.test"
     platforms = ["linux/amd64", "linux/arm64"]

composer.json

@@ -7,17 +7,12 @@
         {
             "type": "composer",
             "url": "https://packages.drupal.org/8"
-        },
-        {
-            "type": "path",
-            "url": "custom/composer"
         }
     ],
     "require": {
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",
         "govcms/govcms": "dev-4.x-develop",
-        "govcms/govcms-custom": "*",
         "govcms/scaffold-tooling": "6.0.5"
     },
     "require-dev": {

custom/composer/composer.json

@@ -1,6 +1,7 @@
 {
     "name": "govcms/govcms-custom",
-    "description": "Provides additional packages over the GovCMS base distribution.",
+    "description": "Provides additional packages over the GovCMS base distribution for SaaS+ sites.",
     "require": {
+        "drupal/webform_openfisca": "^1.1"
     }
 }

docker-compose.yml

@@ -19,6 +19,16 @@ services:
       LAGOON_ROUTE: ${LOCALDEV_URL:-http://govcmslagoon.docker.amazee.io}
     << : *default-volumes
 
+  cli-saasplus:
+    build:
+      context: .
+      dockerfile: $PWD/.docker/Dockerfile.govcms-saasplus
+      args:
+        GOVCMS_IMAGE: ${DOCKERHUB_NAMESPACE:-govcms}/${GOVCMS_CLI_IMAGE_NAME:-govcms}:${GOVCMS_RELEASE_TAG:-latest}
+        COMPOSER_AUTH: ${COMPOSER_AUTH:-}
+    image: ${DOCKERHUB_NAMESPACE:-govcms}/govcms-saasplus:${GOVCMS_RELEASE_TAG:-latest}
+    depends_on:
+      - cli
 
   test:
     build: