From 1fba9bfee923df42912d6bdbac991b5776cd331b Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Fri, 27 Dec 2024 15:18:45 +0100
Subject: [PATCH] docker/gitlab-drupal-ci#54 Remove composer downgrade
---
run/scripts/start | 1 -
setup/scripts/l3d | 1 -
start.sh | 6 ------
3 files changed, 8 deletions(-)
diff --git a/run/scripts/start b/run/scripts/start
index b6b3720..932657c 100755
--- a/run/scripts/start
+++ b/run/scripts/start
@@ -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
diff --git a/setup/scripts/l3d b/setup/scripts/l3d
index 5beafc9..74f80de 100755
--- a/setup/scripts/l3d
+++ b/setup/scripts/l3d
@@ -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+=(
diff --git a/start.sh b/start.sh
index fd2c292..b533adc 100755
--- a/start.sh
+++ b/start.sh
@@ -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
@@ -254,9 +251,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
--
GitLab