quick commit

.github/workflows/ci.yml

@@ -31,3 +31,33 @@ jobs:
         run: bun install
       - name: Build
         run: bun run build
+        
+  build-and-push-docker:
+    needs: [build]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Log in to Docker Registry
+        uses: docker/login-action@v2
+        with:
+          registry: git.rivercry.com
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Build Docker image
+        run: docker build -t git.rivercry.com/wg/monitor-im-flur .
+      - name: Push Docker image
+        run: docker push git.rivercry.com/wg/monitor-im-flur
+      
+      - name: Deploy via SSH
+        uses: appleboy/ssh-action@v0.1.10
+        with:
+          host: rivercry.com
+          port: 20022
+          username: bot
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            cd monitor-im-flur
+            docker pull git.rivercry.com/wg/monitor-im-flur:latest
+            docker stop monitor-im-flur || true
+            docker rm monitor-im-flur || true
+            docker run -d --name monitor-im-flur git.rivercry.com/wg/monitor-im-flur:latest

.github/workflows/docker-build.yml

@@ -1,39 +0,0 @@
-name: Build Docker Image
-
-on:
-  workflow_dispatch:
-  push:
-    branches: [main]
-  pull_request:
-    branches: [main]
-
-jobs:
-  build-and-push-docker:
-    needs: [build]
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Log in to Docker Registry
-        uses: docker/login-action@v2
-        with:
-          registry: git.rivercry.com
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      - name: Build Docker image
-        run: docker build -t git.rivercry.com/wg/monitor-im-flur .
-      - name: Push Docker image
-        run: docker push git.rivercry.com/wg/monitor-im-flur
-      
-      - name: Deploy via SSH
-        uses: appleboy/ssh-action@v0.1.10
-        with:
-          host: rivercry.com
-          port: 20022
-          username: bot
-          key: ${{ secrets.SSH_PRIVATE_KEY }}
-          script: |
-            cd monitor-im-flur
-            docker pull git.rivercry.com/wg/monitor-im-flur:latest
-            docker stop monitor-im-flur || true
-            docker rm monitor-im-flur || true
-            docker run -d --name monitor-im-flur git.rivercry.com/wg/monitor-im-flur:latest