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
Select Git revision
  • develop
  • main
  • 1.5.0
  • 1.5.1
  • 1.6.0
  • 1.6.0-beta1
  • 1.6.0-beta10
  • 1.6.0-beta11
  • 1.6.0-beta12
  • 1.6.0-beta13
  • 1.6.0-beta2
  • 1.6.0-beta3
  • 1.6.0-beta4
  • 1.6.0-beta5
  • 1.6.0-beta6
  • 1.6.0-beta7
  • 1.6.0-beta8
  • 1.6.0-beta9
  • 1.7.0
  • 1.8.0
  • 1.9.0
  • 1.9.0-beta1
  • 1.9.0-beta2
  • 1.9.0-beta3
  • 1.9.0-beta4
  • 1.9.0-rc1
  • 1.9.0-rc10
  • 1.9.0-rc11
  • 1.9.0-rc12
  • 1.9.0-rc2
  • 1.9.0-rc3
  • 1.9.0-rc4
  • 1.9.0-rc5
  • 1.9.0-rc6
  • 1.9.0-rc7
  • 1.9.0-rc8
  • 1.9.0-rc9
  • 1.9.1
  • 1.9.1-dev
  • 2.0.0-beta1
  • 2.0.0-beta2
  • 2.0.0-beta3
  • 2.0.0-beta4
  • 2.0.0-beta5
  • feat-mac-001
  • feat-mac-002
  • feat-mac-003
  • feat-mac-004
  • feat-mac-005
  • feat-mac-006
  • feat-mac-007
  • feature-idea
  • feature-idea2
  • feature-idea3
  • feature104a
  • latest
  • test1
  • test2
  • test3
  • v1.10.0
  • v1.10.1
  • v1.10.2
  • v1.11.0
  • v1.11.1
  • v1.12.0
  • v1.12.1
  • v1.12.2
  • v1.12.3
  • v1.12.4
  • v1.12.5
  • v1.12.6
  • v1.12.7
  • v1.12.8
  • v1.13.0
  • v1.13.1
  • v1.14.0
  • v1.14.1
  • v1.15.0
  • v1.15.1
  • v1.15.2
  • v1.15.3
  • v1.15.4
  • v1.15.5
  • v1.15.6
  • v1.15.7
  • v1.15.8
  • v1.16.0
  • v1.16.1
  • v1.17.0
  • v1.17.1
  • v1.17.2
  • v1.17.3
  • v1.17.4
  • v1.17.5
  • v1.4.0
  • v1.4.1
  • v1.8.1
  • v1.8.2
  • v2.0.0
  • v2.0.1
  • v2.0.2
  • v2.1.0
102 results

Target

Select target project
  • docker/l3d
1 result
Select Git revision
  • develop
  • main
  • 1.5.0
  • 1.5.1
  • 1.6.0
  • 1.6.0-beta1
  • 1.6.0-beta10
  • 1.6.0-beta11
  • 1.6.0-beta12
  • 1.6.0-beta13
  • 1.6.0-beta2
  • 1.6.0-beta3
  • 1.6.0-beta4
  • 1.6.0-beta5
  • 1.6.0-beta6
  • 1.6.0-beta7
  • 1.6.0-beta8
  • 1.6.0-beta9
  • 1.7.0
  • 1.8.0
  • 1.9.0
  • 1.9.0-beta1
  • 1.9.0-beta2
  • 1.9.0-beta3
  • 1.9.0-beta4
  • 1.9.0-rc1
  • 1.9.0-rc10
  • 1.9.0-rc11
  • 1.9.0-rc12
  • 1.9.0-rc2
  • 1.9.0-rc3
  • 1.9.0-rc4
  • 1.9.0-rc5
  • 1.9.0-rc6
  • 1.9.0-rc7
  • 1.9.0-rc8
  • 1.9.0-rc9
  • 1.9.1
  • 1.9.1-dev
  • 2.0.0-beta1
  • 2.0.0-beta2
  • 2.0.0-beta3
  • 2.0.0-beta4
  • 2.0.0-beta5
  • feat-mac-001
  • feat-mac-002
  • feat-mac-003
  • feat-mac-004
  • feat-mac-005
  • feat-mac-006
  • feat-mac-007
  • feature-idea
  • feature-idea2
  • feature-idea3
  • feature104a
  • latest
  • test1
  • test2
  • test3
  • v1.10.0
  • v1.10.1
  • v1.10.2
  • v1.11.0
  • v1.11.1
  • v1.12.0
  • v1.12.1
  • v1.12.2
  • v1.12.3
  • v1.12.4
  • v1.12.5
  • v1.12.6
  • v1.12.7
  • v1.12.8
  • v1.13.0
  • v1.13.1
  • v1.14.0
  • v1.14.1
  • v1.15.0
  • v1.15.1
  • v1.15.2
  • v1.15.3
  • v1.15.4
  • v1.15.5
  • v1.15.6
  • v1.15.7
  • v1.15.8
  • v1.16.0
  • v1.16.1
  • v1.17.0
  • v1.17.1
  • v1.17.2
  • v1.17.3
  • v1.17.4
  • v1.17.5
  • v1.4.0
  • v1.4.1
  • v1.8.1
  • v1.8.2
  • v2.0.0
  • v2.0.1
  • v2.0.2
  • v2.1.0
102 results
Show changes
Commits on Source (3)
...@@ -62,7 +62,6 @@ function startContainer() { ...@@ -62,7 +62,6 @@ function startContainer() {
--env HOME=/home/${USERNAME} --env HOME=/home/${USERNAME}
--env USERNAME=${USERNAME} --env USERNAME=${USERNAME}
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}
--env PHP_VERSION=${PHP_VERSION} --env PHP_VERSION=${PHP_VERSION}
--volume ${L3DDOCKERHOST}:/var/run/docker.sock --volume ${L3DDOCKERHOST}:/var/run/docker.sock
--volume ${WORKDIR}:/drupal --volume ${WORKDIR}:/drupal
......
...@@ -119,7 +119,6 @@ project_params=( ...@@ -119,7 +119,6 @@ project_params=(
--env WORKDIR=${PWD} --env WORKDIR=${PWD}
--env PHP_VERSION=${PHP_VERSION} --env PHP_VERSION=${PHP_VERSION}
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} --env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}
--env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}
) )
if [[ -n "$SSH_AUTH_SOCK" ]]; then if [[ -n "$SSH_AUTH_SOCK" ]]; then
project_params+=( project_params+=(
......
...@@ -39,9 +39,6 @@ function restoreEnvFile { ...@@ -39,9 +39,6 @@ function restoreEnvFile {
if [[ -n ${COMPOSE_PROJECT_NAME} ]]; then if [[ -n ${COMPOSE_PROJECT_NAME} ]]; then
echo "COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}" >>.env echo "COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME}" >>.env
fi fi
if [[ -n ${COMPOSER_DOWNGRADE} ]]; then
echo "COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE}" >>.env
fi
if [[ -f ".env" ]]; then if [[ -f ".env" ]]; then
# shellcheck disable=SC2046 # shellcheck disable=SC2046
# shellcheck disable=SC2094 # shellcheck disable=SC2094
...@@ -125,14 +122,15 @@ function initialSetup { ...@@ -125,14 +122,15 @@ function initialSetup {
echo "" echo ""
echo "Options to start:" echo "Options to start:"
echo " 0 none: start with an empty container" echo " 0 none: start with an empty container"
echo " 1 LakeDrops Drupal 11 project template" echo " 1 LakeDrops Drupal CMS"
echo " 2 LakeDrops Drupal 10 project template" echo " 2 LakeDrops Drupal 11 project template"
echo " 3 drupal.org recommended project template (Drupal 11)" echo " 3 LakeDrops Drupal 10 project template"
echo " 4 drupal.org recommended project template (Drupal 10)" echo " 4 drupal.org recommended project template (Drupal 11)"
echo " 5 Drupal's community project template (Drupal 11)" echo " 5 drupal.org recommended project template (Drupal 10)"
echo " 6 Drupal's community project template (Drupal 10)" echo " 6 Drupal's community project template (Drupal 11)"
echo " 7 Custom project template" echo " 7 Drupal's community project template (Drupal 10)"
echo " 8 Existing git repository" echo " 8 Custom project template"
echo " 9 Existing git repository"
echo "" echo ""
echo "" echo ""
...@@ -147,44 +145,50 @@ function initialSetup { ...@@ -147,44 +145,50 @@ function initialSetup {
;; ;;
1 ) 1 )
PROJECT="lakedrops/cms:1.0.x-dev"
create
break
;;
2 )
PROJECT="lakedrops/d11-project" PROJECT="lakedrops/d11-project"
SITE_INSTALL_ARGS="--existing-config" SITE_INSTALL_ARGS="--existing-config"
create create
break break
;; ;;
2 ) 3 )
PROJECT="lakedrops/d10-project" PROJECT="lakedrops/d10-project"
SITE_INSTALL_ARGS="--existing-config" SITE_INSTALL_ARGS="--existing-config"
create create
break break
;; ;;
3 ) 4 )
PROJECT="drupal/recommended-project:^11" PROJECT="drupal/recommended-project:^11"
create create
break break
;; ;;
4 ) 5 )
PROJECT="drupal/recommended-project:^10" PROJECT="drupal/recommended-project:^10"
create create
break break
;; ;;
5 ) 6 )
PROJECT="drupal-composer/drupal-project:11.x-dev" PROJECT="drupal-composer/drupal-project:11.x-dev"
create create
break break
;; ;;
6 ) 7 )
PROJECT="drupal-composer/drupal-project:10.x-dev" PROJECT="drupal-composer/drupal-project:10.x-dev"
create create
break break
;; ;;
7 ) 8 )
# shellcheck disable=SC2162 # shellcheck disable=SC2162
read -p "Custom project template: " PROJECT read -p "Custom project template: " PROJECT
# shellcheck disable=SC2162 # shellcheck disable=SC2162
...@@ -193,7 +197,7 @@ function initialSetup { ...@@ -193,7 +197,7 @@ function initialSetup {
break break
;; ;;
8 ) 9 )
# shellcheck disable=SC2162 # shellcheck disable=SC2162
read -p "Repository URL: " REPOSITORY read -p "Repository URL: " REPOSITORY
if [[ -n "${REPOSITORY}" ]]; then if [[ -n "${REPOSITORY}" ]]; then
...@@ -254,9 +258,6 @@ if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then ...@@ -254,9 +258,6 @@ if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then
docker rm -f ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d docker rm -f ${COMPOSE_PROJECT_NAME}_${USERNAME}_l3d
fi fi
fi fi
if [[ "$COMPOSER_DOWNGRADE" == "1" ]]; then
composer self-update --1
fi
EXISTING=$(ls -1) EXISTING=$(ls -1)
if [[ -z "$EXISTING" ]]; then if [[ -z "$EXISTING" ]]; then
if [[ -n ${PROJECT} ]]; then if [[ -n ${PROJECT} ]]; then
......