diff --git a/.gitea/workflows/odoo-restore-open_workshop_install.yaml b/.gitea/workflows/odoo-restore-open_workshop_install.yaml index 5a47052..e80d20a 100644 --- a/.gitea/workflows/odoo-restore-open_workshop_install.yaml +++ b/.gitea/workflows/odoo-restore-open_workshop_install.yaml @@ -93,12 +93,12 @@ jobs: -e gpg_password=${{ secrets.GPG_PASSPHRASE }} \ ${{ github.workflow }} /bin/bash -c "bash /root/odoo-restore.sh '${{ env.URL_RESTORE }}'" - #- name: Stop and remove Docker container + - name: Stop and remove Docker container # Nachdem das Restore abgeschlossen ist, wird der Docker-Container gestoppt und entfernt, # um keine Ressourcen auf dem Host unnötig zu verbrauchen. - # run: | - # docker stop ${{ github.workflow }} - # docker rm ${{ github.workflow }} + run: | + docker stop ${{ github.workflow }} + docker rm ${{ github.workflow }} - name: Clone or update custom_addons open_workshop repository run: | diff --git a/scripts/odoo-restore.sh b/scripts/odoo-restore.sh index 0420cbb..65a2b4d 100644 --- a/scripts/odoo-restore.sh +++ b/scripts/odoo-restore.sh @@ -32,17 +32,9 @@ if [ $? -ne 0 ]; then fi cd /root -#setup gpg-agent -#echo "allow-loopback-pinentry" >> /root/.gnupg/gpg-agent.conf -#echo "use-agent" >> /root/.gnupg/gpg.conf -#gpgconf --kill gpg-agent - -# Backup entschlüsseln -#echo "${gpg_password}" | gpg --batch --yes --passphrase-fd 0 --pinentry-mode loopback \ -# -d "${BACKUP_DIR}/${BACKUP_NAME}.gpg" \ -# > "${BACKUP_DIR}/${BACKUP_NAME}.gpg" || report_failure "Backup decryption" -rm ${BACKUP_NAME} -gpg --batch --yes --passphrase "{$gpg_password}" --output "${BACKUP_DIR}/${BACKUP_NAME}" --decrypt "${BACKUP_DIR}/${BACKUP_NAME}.gpg" +# Backup entschlüsseln -> Funktioniert nicht, weil im Passwort ein ´ enthalten ist +#rm ${BACKUP_NAME} +#gpg --batch --yes --passphrase "{$gpg_password}" --output "${BACKUP_DIR}/${BACKUP_NAME}" --decrypt "${BACKUP_DIR}/${BACKUP_NAME}.gpg" echo "Admin password: ${ADMIN_PASSWORD}" # Meldet das Admin-Passwort. echo "Database name: ${ODOO_DATABASE}" # Meldet den Namen der Odoo-Datenbank.