From 0d680afd21da2418fad99cb1ae8a5c9426c5af0f Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Mon, 25 Apr 2022 12:42:40 +0200
Subject: [PATCH] gitlab-ci-cd/drupal#10 - improve steps for NG deployment

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

diff --git a/test-and-deploy.yml b/test-and-deploy.yml
index 0e4382c..6c34b74 100644
--- a/test-and-deploy.yml
+++ b/test-and-deploy.yml
@@ -422,9 +422,14 @@ Debug:
     - cd /data/app
     - drush -y sset system.maintenance_mode 1
     - cd -
+    - rm web/sites/default/files
+    - rm web/sites/default/private
     - rsync -rlDzq --delete ./ /data/app
     - cd /data/files/public
-    - if [[ ! -L config ]]; then ln -s ../../../config/default config; fi
+    - if [[ ! -L config ]]; then ln -s /var/www/html/config/default config; fi
+    - cd /data/app/web/sites/default
+    - if [[ (readlink files) != '/data/default/public' ]]; then rm files; ln -s /data/default/public files; fi
+    - if [[ (readlink private) != '/data/default/private' ]]; then rm private; ln -s /data/default/private private; fi
     - cd /data/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
@@ -432,7 +437,8 @@ Debug:
     - docker compose up -d --quiet-pull --remove-orphans
     - docker compose exec -u root php chown -R www-data:www-data .
     - docker compose exec -u root php chmod -R ug-w .
-    - docker compose exec -u root php chmod -R ug+w ./files
+    - docker compose exec -u root php chmod -R ug+w web/sites/*/files
+    - docker compose exec -u root php chmod -R ug+w web/sites/*/private
     - drush -y cache-rebuild
     - drush -y config-import
     - drush -y updatedb
-- 
GitLab