From 3730d4771184502f07b1171a9947ecb010a8bd5f Mon Sep 17 00:00:00 2001 From: Jochen Mehlich Date: Sat, 24 Oct 2026 14:28:20 +0200 Subject: [PATCH] =?UTF-8?q?Deploy-Action=20in=20eigenes=20=C3=B6ffentliche?= =?UTF-8?q?s=20Repo=20deploy-action=20ausgelagert=20(Runner=20klont=20Acti?= =?UTF-8?q?ons=20anonym)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- action.yml | 74 --------------------------------------------- examples/deploy.yml | 7 +++-- 2 files changed, 4 insertions(+), 77 deletions(-) delete mode 100644 action.yml diff --git a/action.yml b/action.yml deleted file mode 100644 index bd47ef9..0000000 --- a/action.yml +++ /dev/null @@ -1,74 +0,0 @@ -name: docker-deploy -description: Synchronisiert das Repo per rsync nach ~/deployment und startet docker-deploy.sh auf dem Zielserver - -# Verwendung (siehe examples/deploy.yml): -# - uses: actions/checkout@v4 -# - uses: https://git.share-fix.de/jochen/admin-toolsuite@v1 -# with: -# deploy_user: ${{ vars.deploy_user }} -# deploy_host: ${{ vars.deploy_host }} -# deploy_pass: ${{ secrets.deploy_pass }} - -inputs: - deploy_user: - description: Deploy-User auf dem Zielserver - required: true - deploy_host: - description: Hostname/IP des Zielservers - required: true - deploy_pass: - description: Passwort/App-Token des Deploy-Users - required: true - compose_file: - description: Compose-Datei, die vor dem Deploy validiert wird - default: docker-compose.yml - -runs: - using: composite - steps: - - name: Compose-Datei validieren - shell: bash - run: docker compose -f "$COMPOSE_FILE" config --quiet - env: - COMPOSE_FILE: ${{ inputs.compose_file }} - - - name: Tools installieren - shell: bash - run: sudo apt-get update -qq && sudo apt-get install -y -qq sshpass rsync - - - name: Dateien nach ~/deployment synchronisieren - shell: bash - run: | - sshpass -e rsync -az --delete \ - --exclude '.git' --exclude '.gitea' --exclude '.env' \ - --filter=':- .gitignore' \ - -e "ssh $SSH_OPTS" \ - ./ "$DEPLOY_USER@$DEPLOY_HOST:deployment/" - env: - DEPLOY_USER: ${{ inputs.deploy_user }} - DEPLOY_HOST: ${{ inputs.deploy_host }} - SSHPASS: ${{ inputs.deploy_pass }} - SSH_OPTS: -o StrictHostKeyChecking=accept-new -o PubkeyAuthentication=no - - - name: Deploy (pull → build → up) - shell: bash - run: | - sshpass -e ssh $SSH_OPTS "$DEPLOY_USER@$DEPLOY_HOST" \ - "sudo /usr/local/bin/docker-deploy.sh $DEPLOY_USER deploy" - env: - DEPLOY_USER: ${{ inputs.deploy_user }} - DEPLOY_HOST: ${{ inputs.deploy_host }} - SSHPASS: ${{ inputs.deploy_pass }} - SSH_OPTS: -o StrictHostKeyChecking=accept-new -o PubkeyAuthentication=no - - - name: Logs bei Fehler - if: failure() - shell: bash - run: | - sshpass -e ssh $SSH_OPTS "$DEPLOY_USER@$DEPLOY_HOST" \ - "sudo /usr/local/bin/docker-deploy.sh $DEPLOY_USER logs" || true - env: - DEPLOY_USER: ${{ inputs.deploy_user }} - DEPLOY_HOST: ${{ inputs.deploy_host }} - SSHPASS: ${{ inputs.deploy_pass }} - SSH_OPTS: -o StrictHostKeyChecking=accept-new -o PubkeyAuthentication=no diff --git a/examples/deploy.yml b/examples/deploy.yml index 5922daf..9bc3bfb 100644 --- a/examples/deploy.yml +++ b/examples/deploy.yml @@ -1,7 +1,8 @@ # Beispiel: .gitea/workflows/deploy.yml im Repo eines Dienstes # -# Die eigentliche Logik liegt als Composite Action in diesem Repo (action.yml). -# Die Version (@v1.0.1) wird von Renovate per PR aktualisiert (siehe renovate.json). +# Die eigentliche Logik liegt als Composite Action im öffentlichen Repo +# jochen/deploy-action (der Runner klont Actions anonym, daher muss es public sein). +# Die Version (@v1.0.0) wird von Renovate per PR aktualisiert (siehe renovate.json). # # Voraussetzungen (Setup mit create-deploy-user.py --project-path owner/repo): # Variable deploy_user - Deploy-User (wird vom Skript gesetzt) @@ -29,7 +30,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: https://git.share-fix.de/jochen/admin-toolsuite@v1.0.1 + - uses: https://git.share-fix.de/jochen/deploy-action@v1.0.0 with: deploy_user: ${{ vars.deploy_user }} deploy_host: ${{ vars.deploy_host }}