diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index c6370b8..a6e2c50 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -80,7 +80,8 @@ jobs: - name: Install SSH key run: | mkdir -p ~/.ssh - echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519 + # echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed25519 + echo "${{ secrets.DEPLOY_KEY }}" > ~/.ssh/id_ed2551 chmod 600 ~/.ssh/id_ed25519 ssh-keyscan -H "${{ secrets.DEPLOY_HOST }}" >> ~/.ssh/known_hosts @@ -108,6 +109,7 @@ jobs: notify: needs: deploy runs-on: ubuntu-latest + if: always() steps: - name: Wait for ntfy service to be healthy @@ -129,7 +131,16 @@ jobs: - name: Notify ntfy run: | + STATUS="${{ needs.deploy.result }}" + echo "Deployment job finished with status: $STATUS" + + if [ "$STATUS" = "success" ]; then + MSG="🚀 Costco App Deployment succeeded: $IMAGE_NAME:${{ github.sha }}" + else + MSG="❌ Costco App Deployment FAILED: $IMAGE_NAME:${{ github.sha }}" + fi + curl -d "🚀 Deployment successful: $IMAGE_NAME:$GITHUB_SHA" \ - https://ntfy.nicosaya.com/server-deploy + https://ntfy.nicosaya.com/gitea \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 27b49fd..d31b858 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,18 +18,3 @@ services: - "3000:5173" depends_on: - backend - - services: - ntfy: - image: binwiederhier/ntfy - ports: - - 8081:80 - volumes: - - ./ntfy/cache:/var/cache/ntfy - - ./ntfy/etc:/etc/ntfy - restart: unless-stopped - healthcheck: - test: ["CMD", "wget", "-qO-", "http://localhost/"] - interval: 5s - timeout: 3s - retries: 10 \ No newline at end of file