Merge branch 'develop' into feature/halloween

.woodpecker/build.yml

@@ -1,7 +1,7 @@
 variables:
   - &volumes
     - node16_cache:/root/.npm
-    - /data/deblan/deblan.io-murph:/data/deblan/deblan.io-murph
+    - /data/deblan/deblan.io-murph:/builds
 
 when:
   event: [push, pull_request, tag, manual]
@@ -67,11 +67,10 @@ steps:
     failure: ignore
 
   cache-build:
-    image: deblan/php:8.1
+    image: deblan/mage
     volumes: *volumes
     commands:
-      - apt-get update && apt-get -y install rsync
-      - cd /data/deblan/deblan.io-murph/
+      - cd /builds
       - rsync -az "$CI_WORKSPACE/" "$CI_COMMIT_SHA"
 
 services:

.woodpecker/deploy.yml

@@ -1,25 +1,25 @@
 variables:
   - &volumes
-    - /data/deblan/deblan.io-murph:/data/deblan/deblan.io-murph
+    - /data/deblan/deblan.io-murph:/builds
 
 when:
   event: [deployment]
 
+skip_clone: true
+
 steps:
   app-deploy:
-    image: deblan/php:8.1
+    image: deblan/mage
     secrets: [ssh_user, ssh_host, ssh_priv_key, app_directory]
     volumes: *volumes
     commands:
-      - apt-get update && apt-get -y install rsync openssh-client
-      - cd "/data/deblan/deblan.io-murph/$CI_COMMIT_SHA"
+      - cd "/builds/$CI_COMMIT_SHA"
       - mkdir "$HOME/.ssh"
       - echo "$SSH_PRIV_KEY" > "$HOME/.ssh/id_ed25519"
       - chmod 700 "$HOME/.ssh"
       - chmod 600 "$HOME/.ssh/id_ed25519"
-      - composer global require andres-montanez/magallanes
       - cp .mage.yml.dist .mage.yml
       - sed -i "s/ssh_user/$SSH_USER/g" .mage.yml
       - sed -i "s/ssh_host/$SSH_HOST/g" .mage.yml
       - sed -i "s#app_directory#$APP_DIRECTORY#g" .mage.yml
-      - /root/.config/composer/vendor/bin/mage deploy "$CI_PIPELINE_DEPLOY_TARGET"
+      - mage deploy "$CI_PIPELINE_DEPLOY_TARGET"