From 8457b6989ae12d637dee0f1fca16a8c2cae333dd Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 25 Apr 2022 16:42:42 +0200
Subject: [PATCH] gitlab-ci-cd/drupal#10 - adjust deployment data directory
 structure

---
 test-and-deploy.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index bf18d06..b7019c3 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -419,7 +419,7 @@ Debug:
     name: ${ENVIRONMENT_NAME}
     url: ${ENVIRONMENT_URL}
   script:
-    - cd /data/app
+    - cd /data/${CI_COMMIT_REF_NAME}/app
     - drush -y sset system.maintenance_mode 1
     - cd -
     - cd web/sites/default
@@ -428,10 +428,10 @@ Debug:
     - ln -s /data/default/public files
     - ln -s /data/default/private private
     - cd -
-    - rsync -rlDzq --delete ./ /data/app
-    - cd /data/files/public
+    - rsync -rlDzq --delete ./ /data/${CI_COMMIT_REF_NAME}/app
+    - cd /data/${CI_COMMIT_REF_NAME}/files/public
     - if [[ ! -L config ]]; then ln -s /var/www/html/config/default config; fi
-    - cd /data/app
+    - cd /data/${CI_COMMIT_REF_NAME}/app
     - PROXYIP=$(docker inspect traefik-traefik-1 | jq -r '.[0].NetworkSettings.Networks."traefik-public".IPAddress')
     - sed -i "s/TRAEFIK-IP-PLACEHOLDER/${PROXYIP}/g" docker-compose.yml
     - sed -i "s/TRAEFIK-IP-PLACEHOLDER/${PROXYIP}/g" settings/default/settings.docker.php
-- 
GitLab