From 63f906bb02e7293b2c1de92f3af45d87db9ef41d Mon Sep 17 00:00:00 2001 From: Arif Hasanic Date: Thu, 28 Aug 2025 15:47:45 +0200 Subject: [PATCH] update server on main changes --- .github/workflows/ci.yml | 25 +++++++++++++------------ .github/workflows/docker-build.yml | 17 ++++++++++++++++- docker-compose.yml | 2 +- 3 files changed, 30 insertions(+), 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8a8a340..d52e8f6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,17 +7,6 @@ on: branches: [main] jobs: - build: - runs-on: ubuntu-latest - container: - image: oven/bun - steps: - - uses: actions/checkout@v4 - - name: Install dependencies - run: bun install - - name: Build - run: bun run build - lint: runs-on: ubuntu-latest container: @@ -29,4 +18,16 @@ jobs: - name: Biome Check run: biome check - name: Biome Lint - run: biome lint \ No newline at end of file + run: biome lint + + build: + runs-on: ubuntu-latest + needs: lint + container: + image: oven/bun + steps: + - uses: actions/checkout@v4 + - name: Install dependencies + run: bun install + - name: Build + run: bun run build diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 502a702..8eeff63 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -9,6 +9,7 @@ on: jobs: build-and-push-docker: + needs: [build] runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -21,4 +22,18 @@ jobs: - 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 \ No newline at end of file + 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 \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 6b5d256..0c146ed 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: monitor-im-flur: - build: . + image: git.rivercry.com/wg/monitor-im-flur:latest ports: - "9123:5173" restart: unless-stopped