Skip to content
Snippets Groups Projects
Commit 138fed05 authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into 'main'

Merging develop into main

See merge request !49
parents 6cc1ec42 5145276f
No related branches found
No related tags found
1 merge request!49Merging develop into main
......@@ -5,7 +5,7 @@ include:
variables:
VERSION: ${CI_COMMIT_TAG}
CI_VERSION: v2.2.22
CI_VERSION: v2.2.23
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
......
......@@ -123,12 +123,12 @@ function initialSetup {
echo ""
echo "Options to start:"
echo " 0 none: start with an empty container"
echo " 1 LakeDrops Drupal 10 project template"
echo " 2 LakeDrops Drupal 9 project template"
echo " 3 LakeDrops Drupal 8 project template"
echo " 1 LakeDrops Drupal 11 project template"
echo " 2 LakeDrops Drupal 10 project template"
echo " 3 drupal.org recommended project template (Drupal 11)"
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 " 5 Drupal's community project template (Drupal 11)"
echo " 6 Drupal's community project template (Drupal 10)"
echo " 7 Custom project template"
echo " 8 Existing git repository"
echo ""
......@@ -145,22 +145,21 @@ function initialSetup {
;;
1 )
PROJECT="lakedrops/d10-project"
PROJECT="lakedrops/d11-project"
SITE_INSTALL_ARGS="--existing-config"
create
break
;;
2 )
PROJECT="lakedrops/d9-project"
PROJECT="lakedrops/d10-project"
SITE_INSTALL_ARGS="--existing-config"
create
break
;;
3 )
PROJECT="lakedrops/d8-project"
SITE_INSTALL_ARGS="config_installer"
PROJECT="drupal/recommended-project:^11"
create
break
;;
......@@ -172,13 +171,13 @@ function initialSetup {
;;
5 )
PROJECT="drupal/recommended-project:^9"
PROJECT="drupal-composer/drupal-project:11.x-dev"
create
break
;;
6 )
PROJECT="drupal-composer/drupal-project:8.x-dev"
PROJECT="drupal-composer/drupal-project:10.x-dev"
create
break
;;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment