Merge branch 'develop' into 'main'

Merging develop into main

See merge request !20

.gitlab-ci.yml

@@ -34,7 +34,7 @@ php:
   stage: build
   parallel:
     matrix:
-      - PHP: ['7.2','7.3','7.4','8.0','8.1']
+      - PHP: ['7.4','8.0','8.1']
   script:
     - docker build --pull --build-arg PHP_VERSION=${PHP} --build-arg VERSION=${VERSION} --build-arg CI_VERSION=${CI_VERSION} -t ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION} .
     - docker push ${CI_REGISTRY_IMAGE}/php-${PHP}:${VERSION}

start.sh

@@ -121,12 +121,14 @@ function initialSetup {
   echo ""
   echo "Options to start:"
   echo "    0   none: start with an empty container"
-  echo "    1   LakeDrops Drupal 9 project template"
-  echo "    2   LakeDrops Drupal 8 project template"
-  echo "    3   drupal.org recommended project template (Drupal 9)"
-  echo "    4   Drupal's community project template (Drupal 8)"
-  echo "    5   Custom project template"
-  echo "    6   Existing git repository"
+  echo "    1   LakeDrops Drupal 10 project template"
+  echo "    2   LakeDrops Drupal 9 project template"
+  echo "    3   LakeDrops Drupal 8 project template"
+  echo "    4   drupal.org recommended project template (Drupal 10)"
+  echo "    5   drupal.org recommended project template (Drupal 9)"
+  echo "    6   Drupal's community project template (Drupal 8)"
+  echo "    7   Custom project template"
+  echo "    8   Existing git repository"
   echo ""
   echo ""
 
@@ -141,32 +143,45 @@ function initialSetup {
             ;;
 
           1 )
-            PROJECT="lakedrops/d9-project"
+            PROJECT="lakedrops/d10-project"
             SITE_INSTALL_ARGS="--existing-config"
             create
             break
             ;;
 
           2 )
-            PROJECT="lakedrops/d8-project"
-            SITE_INSTALL_ARGS="config_installer"
+            PROJECT="lakedrops/d9-project"
+            SITE_INSTALL_ARGS="--existing-config"
             create
             break
             ;;
 
           3 )
-            PROJECT="drupal/recommended-project"
+            PROJECT="lakedrops/d8-project"
+            SITE_INSTALL_ARGS="config_installer"
             create
             break
             ;;
 
           4 )
-            PROJECT="drupal-composer/drupal-project:8.x-dev"
+            PROJECT="drupal/recommended-project:^10"
             create
             break
             ;;
 
           5 )
+            PROJECT="drupal/recommended-project:^9"
+            create
+            break
+            ;;
+
+          6 )
+            PROJECT="drupal-composer/drupal-project:8.x-dev"
+            create
+            break
+            ;;
+
+          7 )
             # shellcheck disable=SC2162
             read -p "Custom project template: " PROJECT
             # shellcheck disable=SC2162
@@ -175,7 +190,7 @@ function initialSetup {
             break
             ;;
 
-          6 )
+          8 )
             # shellcheck disable=SC2162
             read -p "Repository URL: " REPOSITORY
             if [[ -n "${REPOSITORY}" ]]; then