#10

- improve steps for NG deployment

test-and-deploy.yml

@@ -424,16 +424,15 @@ Debug:
     - cd -
     - rsync -rlDzq --delete ./ /data/app
     - cd /data/files/public
-    - if [[ ! -f config ]]; then ln -s ../../../config/default config; fi
+    - if [[ ! -L config ]]; then ln -s ../../../config/default config; fi
     - cd /data/app
-    - PROXYIP=$(docker inspect traefik_traefik_1 | jq '.[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
-    - chown -R 82:www-docker /data/app
-    - chown -R 82:www-docker /data/files
-    - chmod -R ug-w /data/app
-    - chmod -R ug+w /data/files
+    - PROXYIP=$(docker inspect traefik_traefik_1 | jq -r '.[0].NetworkSettings.Networks."traefik-public".IPAddress')
+    - sed -i 2s/TRAEFIK-IP-PLACEHOLDER/${PROXYIP}/g" docker-compose.yml
+    - sed -i "s/TRAEFIK-IP-PLACEHOLDER/${PROXYIP}/g" settings/default/settings.docker.php
     - 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
     - drush -y cache-rebuild
     - drush -y config-import
     - drush -y updatedb