diff --git a/CHANGELOG b/CHANGELOG
index fc68daefba213d3c8aaa8a18496e1275df521db6..57c6aebf0f8bcc8c768f72ab3a2e26ce34c249e3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+v1.13.1 2020-07-15
+------------------
+Map the local .gitignore_global into containers
+
+v1.13.0 2020-07-20
+------------------
+Add support for Drupal 9 project templates
+
v1.12.8 2020-05-22
------------------
Force update to update to base image v1.4.4
diff --git a/run/scripts/start b/run/scripts/start
index e580c360b2a51a38bba39668f8798b91f0f0203f..975dc4f7e7bbf279923b41ca24ddb823d7a73a1b 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -35,6 +35,7 @@ function startContainer {
--volume ${SSHAUTH}:${SSHAUTHSOCK} \
--volume ${HOMEDIR}/.traefik:/root/.traefik \
--volume ${HOMEDIR}/.gitconfig:/root/.gitconfig \
+ --volume ${HOMEDIR}/.gitignore_global:/root/.gitignore_global \
--volume ${HOMEDIR}/.composer/auth.json:/root/.composer/auth.json \
--workdir /drupal \
--restart unless-stopped \
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index c478a9ddf9aa2296a4ad3dd631e3a68f10d4083c..564f0d2a36d6b0496b604c823324f99568e4b13e 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -25,6 +25,7 @@ esac
mkdir -p ${HOME}/.composer
touch ${HOME}/.composer/auth.json
touch ${HOME}/.gitconfig
+touch ${HOME}/.gitignore_global
ID=$(docker container ls --all -q -f name=^l3drun$)
if [[ ! -n ${ID} ]]; then
diff --git a/start.sh b/start.sh
index 779fdef7e34095921c00b10a5b917b3585d6f3bf..96567d02db224c4860b2539791b2c315c72fb97c 100755
--- a/start.sh
+++ b/start.sh
@@ -55,7 +55,7 @@ function create {
# Start container
a d4d up
sleep 2
- drush --no-interaction si config_installer
+ drush --no-interaction si ${SITE_INSTALL_ARGS}
# Init site config values
if [[ -f "drush/Commands/dev_modules/dev_modules.info.yml" ]]; then
@@ -110,10 +110,12 @@ function initialSetup {
echo ""
echo "Options to start:"
echo " 0 none: start with an empty container"
- echo " 1 LakeDrops Drupal 8 project template"
- echo " 2 Drupal's community project template"
- echo " 3 Custom project template"
- echo " 4 Existing git repository"
+ 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 ""
echo ""
@@ -128,18 +130,32 @@ function initialSetup {
;;
1 )
- PROJECT="lakedrops/d8-project"
+ PROJECT="lakedrops/d9-project"
+ SITE_INSTALL_ARGS="--existing-config"
create
break
;;
2 )
- PROJECT="drupal-composer/drupal-project:8.x-dev"
+ PROJECT="lakedrops/d8-project"
+ SITE_INSTALL_ARGS="config_installer"
create
break
;;
3 )
+ PROJECT="drupal/recommended-project"
+ create
+ break
+ ;;
+
+ 4 )
+ PROJECT="drupal-composer/drupal-project:8.x-dev"
+ create
+ break
+ ;;
+
+ 5 )
# shellcheck disable=SC2162
read -p "Custom project template: " PROJECT
# shellcheck disable=SC2162
@@ -148,7 +164,7 @@ function initialSetup {
break
;;
- 4 )
+ 6 )
# shellcheck disable=SC2162
read -p "Repository URL: " REPOSITORY
if [[ -n "${REPOSITORY}" ]]; then