Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • docker/l3d
1 result
Show changes
Commits on Source (3)
......@@ -62,7 +62,6 @@ function startContainer() {
--env HOME=/home/${USERNAME}
--env USERNAME=${USERNAME}
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}
--env PHP_VERSION=${PHP_VERSION}
--volume ${L3DDOCKERHOST}:/var/run/docker.sock
--volume ${WORKDIR}:/drupal
......
......@@ -119,7 +119,6 @@ project_params=(
--env WORKDIR=${PWD}
--env PHP_VERSION=${PHP_VERSION}
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}
)
if [[ -n "$SSH_AUTH_SOCK" ]]; then
project_params+=(
......
......@@ -39,9 +39,6 @@ function restoreEnvFile {
if [[ -n ${COMPOSE_PROJECT_NAME} ]]; then
echo "COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}" >>.env
fi
if [[ -n ${COMPOSER_DOWNGRADE} ]]; then
echo "COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}" >>.env
fi
if [[ -f ".env" ]]; then
# shellcheck disable=SC2046
# shellcheck disable=SC2094
......@@ -125,14 +122,15 @@ function initialSetup {
echo ""
echo "Options to start:"
echo " 0 none: start with an empty container"
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'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 " 1 LakeDrops Drupal CMS"
echo " 2 LakeDrops Drupal 11 project template"
echo " 3 LakeDrops Drupal 10 project template"
echo " 4 drupal.org recommended project template (Drupal 11)"
echo " 5 drupal.org recommended project template (Drupal 10)"
echo " 6 Drupal's community project template (Drupal 11)"
echo " 7 Drupal's community project template (Drupal 10)"
echo " 8 Custom project template"
echo " 9 Existing git repository"
echo ""
echo ""
......@@ -147,44 +145,50 @@ function initialSetup {
;;
1 )
PROJECT="lakedrops/cms:1.0.x-dev"
create
break
;;
2 )
PROJECT="lakedrops/d11-project"
SITE_INSTALL_ARGS="--existing-config"
create
break
;;
2 )
3 )
PROJECT="lakedrops/d10-project"
SITE_INSTALL_ARGS="--existing-config"
create
break
;;
3 )
4 )
PROJECT="drupal/recommended-project:^11"
create
break
;;
4 )
5 )
PROJECT="drupal/recommended-project:^10"
create
break
;;
5 )
6 )
PROJECT="drupal-composer/drupal-project:11.x-dev"
create
break
;;
6 )
7 )
PROJECT="drupal-composer/drupal-project:10.x-dev"
create
break
;;
7 )
8 )
# shellcheck disable=SC2162
read -p "Custom project template: " PROJECT
# shellcheck disable=SC2162
......@@ -193,7 +197,7 @@ function initialSetup {
break
;;
8 )
9 )
# shellcheck disable=SC2162
read -p "Repository URL: " REPOSITORY
if [[ -n "${REPOSITORY}" ]]; then
......@@ -254,9 +258,6 @@ if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then
docker rm -f ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d
fi
fi
if [[ "$COMPOSER_DOWNGRADE" == "1" ]]; then
composer self-update --1
fi
EXISTING=$(ls -1)
if [[ -z "$EXISTING" ]]; then
if [[ -n ${PROJECT} ]]; then
......