From 906bc14e2b98af1b7417910a72b46fe06db0130e Mon Sep 17 00:00:00 2001
From: gregharvey <greg.harvey@gmail.com>
Date: Fri, 9 Sep 2022 10:42:52 +0200
Subject: [PATCH 1/4] Adding a Drupal 9 template to ce-dev.

---
 templates/drupal9/ce-dev/ansible/deploy.yml.j2          | 4 ++--
 templates/drupal9/ce-dev/ce-dev.compose.prebuilt.yml.j2 | 4 ++--
 templates/prebuild.sh                                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/drupal9/ce-dev/ansible/deploy.yml.j2 b/templates/drupal9/ce-dev/ansible/deploy.yml.j2
index 29aaef8..853fc4c 100644
--- a/templates/drupal9/ce-dev/ansible/deploy.yml.j2
+++ b/templates/drupal9/ce-dev/ansible/deploy.yml.j2
@@ -1,9 +1,9 @@
 ---
-# Template playbook for a local Drupal9 codebase.
+# Template playbook for a local Drupal 9 codebase.
 - hosts: {{ project_name }}-web
   vars:
     - project_name: {{ project_name }}
-    - project_type: drupal8
+    - project_type: drupal9
     - webroot: web
     - build_type: local
     - _env_type: dev
diff --git a/templates/drupal9/ce-dev/ce-dev.compose.prebuilt.yml.j2 b/templates/drupal9/ce-dev/ce-dev.compose.prebuilt.yml.j2
index 9902799..c1f83bb 100644
--- a/templates/drupal9/ce-dev/ce-dev.compose.prebuilt.yml.j2
+++ b/templates/drupal9/ce-dev/ce-dev.compose.prebuilt.yml.j2
@@ -11,7 +11,7 @@ x-ce_dev:
     - 'https://www.{{ project_name }}.local'
 services:
   web:
-    image: 'codeenigma/drupal8-web:latest'
+    image: 'codeenigma/drupal9-web:latest'
     expose:
       - 443
       - 80
@@ -34,6 +34,6 @@ services:
     cap_add:
       - NET_ADMIN
   db:
-    image: 'codeenigma/drupal8-db:latest'
+    image: 'codeenigma/drupal9-db:latest'
     environment:
       MYSQL_ROOT_PASSWORD: ce-dev
diff --git a/templates/prebuild.sh b/templates/prebuild.sh
index cb40a31..a812e09 100644
--- a/templates/prebuild.sh
+++ b/templates/prebuild.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Test project creation and pre-build image.
 set -e
-PROJECTS="blank drupal8"
+PROJECTS="blank drupal8 drupal9"
 
 # Common processing.
 OWN_DIR=$(dirname "$0")

From f29db1105937aa7dd70e26dd9dcb9b2513bb2f8f Mon Sep 17 00:00:00 2001
From: gregharvey <greg.harvey@gmail.com>
Date: Fri, 9 Sep 2022 11:44:26 +0200
Subject: [PATCH 2/4] Testing nodejs version change with blank template.

---
 templates/blank/ce-dev/ansible/provision.yml.j2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/templates/blank/ce-dev/ansible/provision.yml.j2 b/templates/blank/ce-dev/ansible/provision.yml.j2
index 796799a..1f1194c 100644
--- a/templates/blank/ce-dev/ansible/provision.yml.j2
+++ b/templates/blank/ce-dev/ansible/provision.yml.j2
@@ -8,6 +8,8 @@
     - _env_type: dev
     - lhci:
         enable_vnc: true
+    - nodejs:
+        version: 14.x
   tasks:
     - apt:
         update_cache: true

From 7fda697f343d0c363dcac538d0563b9488e836c7 Mon Sep 17 00:00:00 2001
From: gregharvey <greg.harvey@gmail.com>
Date: Fri, 9 Sep 2022 11:49:11 +0200
Subject: [PATCH 3/4] Incrementing version for release.

---
 RELEASE      | 4 ++--
 package.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/RELEASE b/RELEASE
index bd67827..ec9f751 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,2 +1,2 @@
-1.1.21
-Drupal 9 template configured with composer 2 by default
+1.1.22
+Drupal 9 template building.
diff --git a/package.json b/package.json
index 8c10d24..02d87ff 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "ce-dev",
   "description": "Local Stack wrapper tool",
-  "version": "1.1.21",
+  "version": "1.1.22",
   "author": " @pm98zz-c",
   "bin": {
     "ce-dev": "./bin/run"

From 2d2ece6e8d038426cc0816c5efb03bb39dfdba10 Mon Sep 17 00:00:00 2001
From: gregharvey <greg.harvey@gmail.com>
Date: Fri, 9 Sep 2022 12:57:42 +0200
Subject: [PATCH 4/4] There's no drupal9 template for ce-deploy.

---
 templates/drupal9/ce-dev/ansible/deploy.yml.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/drupal9/ce-dev/ansible/deploy.yml.j2 b/templates/drupal9/ce-dev/ansible/deploy.yml.j2
index 853fc4c..0826731 100644
--- a/templates/drupal9/ce-dev/ansible/deploy.yml.j2
+++ b/templates/drupal9/ce-dev/ansible/deploy.yml.j2
@@ -3,7 +3,7 @@
 - hosts: {{ project_name }}-web
   vars:
     - project_name: {{ project_name }}
-    - project_type: drupal9
+    - project_type: drupal8
     - webroot: web
     - build_type: local
     - _env_type: dev