From bf056dc28e447beae4973eb2411ff8fe744dc212 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 17 Nov 2020 09:50:36 +0100
Subject: [PATCH] docker/l3d#47 Optionally downgrade composer to version 1
---
run/scripts/start | 11 +++++++++++
setup/scripts/l3d | 1 +
start.sh | 3 +++
3 files changed, 15 insertions(+)
diff --git a/run/scripts/start b/run/scripts/start
index b19a212..bec088c 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -14,6 +14,16 @@ function getConfig {
esac
done
fi
+ if [[ ! -n ${COMPOSER_DOWNGRADE} ]]; then
+ while true; do
+ read -p "Do you want to downgrade Composer to version 1? " COMPOSER_DOWNGRADE
+ case ${COMPOSER_DOWNGRADE} in
+ 0 ) break;;
+ 1 ) break;;
+ * ) echo "Only 1 or 0 are valid responses.";;
+ esac
+ done
+ fi
if [[ ! -n ${COMPOSE_PROJECT_NAME} ]]; then
read -p "Name your project (used as subdomain): " COMPOSE_PROJECT_NAME
fi
@@ -29,6 +39,7 @@ function startContainer {
--hostname ${COMPOSE_PROJECT_NAME}-l3d \
--env L3DSHELL=${L3DSHELL} \
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
+ --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
--env PHP_VERSION=${PHP_VERSION} \
--env SSH_AUTH_SOCK=${SSHAUTHSOCK} \
--volume /var/run/docker.sock:/var/run/docker.sock \
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 564f0d2..5fad170 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -54,5 +54,6 @@ docker exec -it \
--env SSHAUTHSOCK=${SSHAUTHSOCK} \
--env PHP_VERSION=${PHP_VERSION} \
--env COMPOSE_PROJECT_NAME=${COMPOSE_PROJECT_NAME} \
+ --env COMPOSER_DOWNGRADE=${COMPOSER_DOWNGRADE} \
l3drun \
/usr/local/bin/run $@
diff --git a/start.sh b/start.sh
index 96567d0..a82b33c 100755
--- a/start.sh
+++ b/start.sh
@@ -181,6 +181,9 @@ function initialSetup {
}
readEnv
+if [[ "$COMPOSER_DOWNGRADE" == "1" ]]; then
+ composer self-update --1
+fi
EXISTING=$(ls -1)
if [[ -z "$EXISTING" ]]; then
if [[ -n ${PROJECT} ]]; then
--
GitLab