From 9b9c35d60f22f68c340d52c10436ab716824ff44 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen.haas@lakedrops.com>
Date: Wed, 27 Mar 2024 13:51:13 +0100
Subject: [PATCH] gitlab-ci-cd/drupal#73 Change docker compose project name to
prefix drupal_ for deployed sites, so that they are different from pipeline
project names
---
test-and-deploy.yml | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index d626ce5..5a5a746 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -280,7 +280,6 @@ Debug:
- !reference [.prepareaccess, before_script]
- !reference [.preparecomposerplugins, before_script]
script:
- - if [[ -n $DOWNGRADE_COMPOSER ]]; then composer self-update --$DOWNGRADE_COMPOSER; fi
- /usr/local/bin/update-env
- composer install --no-interaction --no-progress --no-dev
- composer show --path drupal/core-vendor-hardening >/dev/null 2>&1 || composer require --update-no-dev --no-interaction --no-progress drupal/core-vendor-hardening
@@ -304,8 +303,8 @@ Debug:
- !reference [.preparecomposerplugins, before_script]
variables:
LAKEDROPS_BUILD_NG: 'yes'
+ COMPOSE_PROJECT_NAME: drupal_$COMPOSE_PROJECT_NAME
script:
- - if [[ -n $DOWNGRADE_COMPOSER ]]; then composer self-update --$DOWNGRADE_COMPOSER; fi
- composer show --path lakedrops/drupal-environment >/dev/null 2>&1 || composer require --update-no-dev --no-interaction --no-progress lakedrops/drupal-environment
- composer show --path lakedrops/docker4drupal >/dev/null 2>&1 || composer require --update-no-dev --no-interaction --no-progress lakedrops/docker4drupal
- composer lakedrops:config
@@ -327,7 +326,6 @@ Debug:
- !reference [.prepareaccess, before_script]
- !reference [.preparecomposerplugins, before_script]
script:
- - if [[ -n $DOWNGRADE_COMPOSER ]]; then composer self-update --$DOWNGRADE_COMPOSER; fi
# Run the following twice to ensure new patches get applied.
- composer install --no-interaction --no-progress
- composer install --no-interaction --no-progress
--
GitLab