updated deploy to manage rollback

.gitea/workflows/deploy-env.yml

@@ -70,7 +70,6 @@ jobs:
             echo "WARNING: $ENV_FILE non trovato, il deploy procede senza env file"
           fi
 
-          # Cerca anche eventuali file apache
           APACHE="apache-${ENV_NAME}.conf"
           if [ -f "$APACHE" ]; then
             echo "Apache config: $APACHE"
@@ -83,26 +82,6 @@ jobs:
           chmod 600 ~/.ssh/id_ed25519
           ssh-keyscan -H "${{ vars[inputs.host-var] }}" >> ~/.ssh/known_hosts 2>/dev/null
 
-      - name: Pre-deploy
-        run: |
-          HOST="${{ vars[inputs.host-var] }}"
-          REMOTE_PATH="${DEPLOY_BASE_PATH}/${{ github.repository_owner }}/${{ github.event.repository.name }}"
-          APACHE="apache-${ENV_NAME}.conf"
-          SITE_NAME="${{ github.event.repository.name }}.site-ssl"
-
-          # Comandi standard (sempre eseguiti)
-          ssh ${DEPLOY_USER}@${HOST} "a2dissite ${SITE_NAME} -q || true"
-          ssh ${DEPLOY_USER}@${HOST} "service apache2 reload"
-          if [ -f "$APACHE" ]; then
-            ssh ${DEPLOY_USER}@${HOST} "cp -v /etc/apache2/sites-available/${SITE_NAME}.conf /etc/apache2/sites-available/${SITE_NAME}.conf_\$(date +%s)" || true
-            ssh ${DEPLOY_USER}@${HOST} "cp -v ${REMOTE_PATH}/${APACHE} /etc/apache2/sites-available/${SITE_NAME}.conf"
-          fi
-
-          # Comando custom (solo se fornito)
-          if [ -n "${{ inputs.pre-deploy-cmd }}" ]; then
-            ssh ${DEPLOY_USER}@${HOST} "${{ inputs.pre-deploy-cmd }}"
-          fi
-
       - name: Docker login sul server
         run: |
           HOST="${{ vars[inputs.host-var] }}"
@@ -112,7 +91,12 @@ jobs:
           # Scrive config.json direttamente, senza passare per docker login / credential helper
           ssh ${DEPLOY_USER}@${HOST} "mkdir -p /tmp/.docker-ci && echo '{\"auths\":{\"${REGISTRY}\":{\"auth\":\"${AUTH}\"}}}' > /tmp/.docker-ci/config.json"
 
-      - name: Deploy
+      # ─────────────────────────────────────────────────────────────
+      # SNAPSHOT: prima di sovrascrivere qualsiasi cosa, salviamo lo
+      # stato attuale (compose/env + immagini in esecuzione) così da
+      # poter ripristinare la versione precedente in caso di errore.
+      # ─────────────────────────────────────────────────────────────
+      - name: Prepara server (snapshot rollback + copia file)
         run: |
           HOST="${{ vars[inputs.host-var] }}"
           REMOTE_PATH="${DEPLOY_BASE_PATH}/${{ github.repository_owner }}/${{ github.event.repository.name }}"
@@ -120,33 +104,115 @@ jobs:
           ENV_FILE=".env_${ENV_NAME}"
           APACHE="apache-${ENV_NAME}.conf"
 
-          # Crea directory remota
+          ENVFLAG=""
+          [ -f "$ENV_FILE" ] && ENVFLAG="--env-file ${ENV_FILE}"
+
           ssh ${DEPLOY_USER}@${HOST} "mkdir -p ${REMOTE_PATH}"
 
-          # Copia file
+          # Snapshot dello stato corrente PRIMA di sovrascrivere i file
+          ssh ${DEPLOY_USER}@${HOST} "
+            set -e
+            cd ${REMOTE_PATH}
+            rm -rf .rollback && mkdir -p .rollback
+            if [ -f ${COMPOSE} ]; then
+              cp -f ${COMPOSE} .rollback/${COMPOSE}
+              [ -f ${ENV_FILE} ] && cp -f ${ENV_FILE} .rollback/${ENV_FILE} || true
+              ids=\$(docker compose -f ${COMPOSE} ${ENVFLAG} ps -q 2>/dev/null || true)
+              if [ -n \"\$ids\" ]; then
+                echo 'services:' > .rollback/pin.yml
+                for cid in \$ids; do
+                  svc=\$(docker inspect -f '{{ index .Config.Labels \"com.docker.compose.service\" }}' \$cid 2>/dev/null || true)
+                  img=\$(docker inspect -f '{{ .Image }}' \$cid 2>/dev/null || true)
+                  if [ -n \"\$svc\" ] && [ -n \"\$img\" ]; then
+                    printf '  %s:\n    image: \"%s\"\n' \"\$svc\" \"\$img\" >> .rollback/pin.yml
+                  fi
+                done
+                echo 'Snapshot immagini correnti salvato (.rollback/pin.yml).'
+              fi
+            else
+              echo 'Nessun deploy precedente: snapshot non necessario.'
+            fi
+          "
+
+          # Copia i nuovi file sul server
           FILES_TO_COPY="${COMPOSE}"
           [ -f "$ENV_FILE" ] && FILES_TO_COPY="${FILES_TO_COPY} ${ENV_FILE}"
           [ -f "$APACHE" ] && FILES_TO_COPY="${FILES_TO_COPY} ${APACHE}"
-
           scp ${FILES_TO_COPY} ${DEPLOY_USER}@${HOST}:${REMOTE_PATH}/
 
-          # Pull e up con DOCKER_CONFIG per evitare GPG
+      # ─────────────────────────────────────────────────────────────
-          COMPOSE_CMD="cd ${REMOTE_PATH} && DOCKER_CONFIG=/tmp/.docker-ci docker compose -f ${COMPOSE}"
+      # APACHE: sostituiamo il file di config SOLO se è cambiato.
-          [ -f "$ENV_FILE" ] && COMPOSE_CMD="${COMPOSE_CMD} --env-file ${ENV_FILE}"
+      # Il backup timestamped viene creato solo in caso di differenza.
-          COMPOSE_CMD="${COMPOSE_CMD} pull && ${COMPOSE_CMD} up -d ${{ inputs.compose-opts }}"
+      # Il reload avviene dopo un deploy andato a buon fine (post-deploy),
+      # così non c'è downtime né rischio se il deploy fallisce.
+      # ─────────────────────────────────────────────────────────────
+      - name: Applica config Apache (solo se cambiata)
+        run: |
+          HOST="${{ vars[inputs.host-var] }}"
+          REMOTE_PATH="${DEPLOY_BASE_PATH}/${{ github.repository_owner }}/${{ github.event.repository.name }}"
+          APACHE="apache-${ENV_NAME}.conf"
+          SITE="${{ github.event.repository.name }}.site-ssl"
 
-          ssh ${DEPLOY_USER}@${HOST} "${COMPOSE_CMD}"
+          if [ ! -f "$APACHE" ]; then
+            echo "Nessun ${APACHE} nel repo: gestione Apache saltata."
+            exit 0
+          fi
+
+          ssh ${DEPLOY_USER}@${HOST} "
+            set -e
+            ACTIVE=/etc/apache2/sites-available/${SITE}.conf
+            NEW=${REMOTE_PATH}/${APACHE}
+            MARK=${REMOTE_PATH}/.apache-rollback
+            if cmp -s \"\$NEW\" \"\$ACTIVE\"; then
+              echo 'Config Apache invariata: nessun backup, nessuna modifica.'
+              rm -f \"\$MARK\"
+            else
+              if [ -f \"\$ACTIVE\" ]; then
+                BK=\"\${ACTIVE}_\$(date +%s)\"
+                cp -v \"\$ACTIVE\" \"\$BK\"
+                echo \"\$BK\" > \"\$MARK\"
+              else
+                # Prima installazione: nessun file precedente da ripristinare
+                echo '' > \"\$MARK\"
+              fi
+              cp -v \"\$NEW\" \"\$ACTIVE\"
+              echo 'Config Apache aggiornata (reload dopo il deploy).'
+            fi
+          "
+
+      - name: Pre-deploy (comando custom)
+        if: ${{ inputs.pre-deploy-cmd != '' }}
+        run: |
+          HOST="${{ vars[inputs.host-var] }}"
+          ssh ${DEPLOY_USER}@${HOST} "${{ inputs.pre-deploy-cmd }}"
+
+      - name: Deploy
+        run: |
+          HOST="${{ vars[inputs.host-var] }}"
+          REMOTE_PATH="${DEPLOY_BASE_PATH}/${{ github.repository_owner }}/${{ github.event.repository.name }}"
+          COMPOSE="docker-compose-${ENV_NAME}.yml"
+          ENV_FILE=".env_${ENV_NAME}"
+
+          CBASE="cd ${REMOTE_PATH} && DOCKER_CONFIG=/tmp/.docker-ci docker compose -f ${COMPOSE}"
+          [ -f "$ENV_FILE" ] && CBASE="${CBASE} --env-file ${ENV_FILE}"
+
+          ssh ${DEPLOY_USER}@${HOST} "${CBASE} pull"
+          ssh ${DEPLOY_USER}@${HOST} "${CBASE} up -d ${{ inputs.compose-opts }}"
 
       - name: Post-deploy
         run: |
           HOST="${{ vars[inputs.host-var] }}"
-          SITE_NAME="${{ github.event.repository.name }}.site-ssl"
+          REMOTE_PATH="${DEPLOY_BASE_PATH}/${{ github.repository_owner }}/${{ github.event.repository.name }}"
+          SITE="${{ github.event.repository.name }}.site-ssl"
 
-          # Comandi standard (sempre eseguiti)
+          # Deploy OK: attiva il sito e ricarica Apache con la nuova config
-          ssh ${DEPLOY_USER}@${HOST} "a2ensite ${SITE_NAME} -q"
+          ssh ${DEPLOY_USER}@${HOST} "a2ensite ${SITE} -q"
           ssh ${DEPLOY_USER}@${HOST} "service apache2 reload"
           ssh ${DEPLOY_USER}@${HOST} "DOCKER_CONFIG=/tmp/.docker-ci docker image prune -a -f"
 
+          # Deploy riuscito: lo snapshot di rollback non serve più
+          ssh ${DEPLOY_USER}@${HOST} "rm -rf ${REMOTE_PATH}/.rollback ${REMOTE_PATH}/.apache-rollback"
+
           # Comando custom (solo se fornito)
           if [ -n "${{ inputs.post-deploy-cmd }}" ]; then
             ssh ${DEPLOY_USER}@${HOST} "${{ inputs.post-deploy-cmd }}"
@@ -159,11 +225,73 @@ jobs:
           COMPOSE="docker-compose-${ENV_NAME}.yml"
           ENV_FILE=".env_${ENV_NAME}"
 
-          COMPOSE_CMD="cd ${REMOTE_PATH} && DOCKER_CONFIG=/tmp/.docker-ci docker compose -f ${COMPOSE}"
+          CBASE="cd ${REMOTE_PATH} && DOCKER_CONFIG=/tmp/.docker-ci docker compose -f ${COMPOSE}"
-          [ -f "$ENV_FILE" ] && COMPOSE_CMD="${COMPOSE_CMD} --env-file ${ENV_FILE}"
+          [ -f "$ENV_FILE" ] && CBASE="${CBASE} --env-file ${ENV_FILE}"
 
           echo "── Container status ──"
-          ssh ${DEPLOY_USER}@${HOST} "${COMPOSE_CMD} ps"
+          ssh ${DEPLOY_USER}@${HOST} "${CBASE} ps"
 
           # Cleanup config temporaneo
           ssh ${DEPLOY_USER}@${HOST} "rm -rf /tmp/.docker-ci"
+
+      # ─────────────────────────────────────────────────────────────
+      # ROLLBACK: eseguito SOLO se uno step precedente è fallito.
+      # 1) ripristina la config Apache precedente e riabilita il sito
+      # 2) riporta i container alla versione precedente (immagini pinnate)
+      # ─────────────────────────────────────────────────────────────
+      - name: Rollback (deploy fallito)
+        if: failure()
+        run: |
+          HOST="${{ vars[inputs.host-var] }}"
+          REMOTE_PATH="${DEPLOY_BASE_PATH}/${{ github.repository_owner }}/${{ github.event.repository.name }}"
+          COMPOSE="docker-compose-${ENV_NAME}.yml"
+          ENV_FILE=".env_${ENV_NAME}"
+          SITE="${{ github.event.repository.name }}.site-ssl"
+
+          ENVFLAG=""
+          [ -f "$ENV_FILE" ] && ENVFLAG="--env-file ${ENV_FILE}"
+
+          echo "Deploy fallito: avvio rollback."
+
+          # 1) Ripristino config Apache
+          ssh ${DEPLOY_USER}@${HOST} "
+            ACTIVE=/etc/apache2/sites-available/${SITE}.conf
+            MARK=${REMOTE_PATH}/.apache-rollback
+            if [ -f \"\$MARK\" ]; then
+              BK=\$(cat \"\$MARK\")
+              if [ -n \"\$BK\" ] && [ -f \"\$BK\" ]; then
+                echo \"Ripristino config Apache da \$BK\"
+                cp -v \"\$BK\" \"\$ACTIVE\"
+                a2ensite ${SITE} -q || true
+              else
+                echo 'Nessuna config precedente: rimuovo e disabilito il sito.'
+                rm -f \"\$ACTIVE\"
+                a2dissite ${SITE} -q || true
+              fi
+              rm -f \"\$MARK\"
+            else
+              echo 'Config Apache non modificata: riabilito il sito corrente.'
+              a2ensite ${SITE} -q || true
+            fi
+            service apache2 reload || true
+          "
+
+          # 2) Rollback dei container alla versione precedente
+          ssh ${DEPLOY_USER}@${HOST} "
+            set -e
+            cd ${REMOTE_PATH}
+            if [ -f .rollback/${COMPOSE} ]; then
+              cp -f .rollback/${COMPOSE} ${COMPOSE}
+              [ -f .rollback/${ENV_FILE} ] && cp -f .rollback/${ENV_FILE} ${ENV_FILE} || true
+              PIN=''
+              [ -f .rollback/pin.yml ] && PIN='-f .rollback/pin.yml'
+              echo 'Ripristino container alla versione precedente...'
+              DOCKER_CONFIG=/tmp/.docker-ci docker compose -f ${COMPOSE} \$PIN ${ENVFLAG} up -d \
+                || echo 'ATTENZIONE: rollback container non riuscito, verifica manuale necessaria.'
+            else
+              echo 'Nessuno snapshot disponibile: nessun rollback container (probabile primo deploy).'
+            fi
+          "
+
+          # Cleanup config temporaneo
+          ssh ${DEPLOY_USER}@${HOST} "rm -rf /tmp/.docker-ci" || true