fix

.forgejo/workflows/addin.yml

@@ -5,15 +5,17 @@ on:
     branches:
       - main
       - master
+    tags:
+      - "addin-*.*.*"
     paths:
-      - 'addin/**'
-      - 'docker-compose.yml'
-      - '.forgejo/workflows/addin.yml'
+      - "addin/**"
+      - "docker-compose.yml"
+      - ".forgejo/workflows/addin.yml"
   pull_request:
     paths:
-      - 'addin/**'
-      - 'docker-compose.yml'
-      - '.forgejo/workflows/addin.yml'
+      - "addin/**"
+      - "docker-compose.yml"
+      - ".forgejo/workflows/addin.yml"
 
 permissions:
   contents: read
@@ -33,7 +35,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: "20"
 
       - name: Install dependencies
         run: npm install --no-fund --no-audit

.forgejo/workflows/backend.yml

@@ -1,36 +1,40 @@
-name: Deploy DocEdit Backend CI
+name: Backend CI + Docker Deploy
 
 on:
   push:
+    branches:
+      - main
+      - master
     tags:
       - "backend-*.*.*"
+    paths:
+      - "backend/**"
+      - "docker-compose.yml"
+      - ".forgejo/workflows/backend.yml"
+  pull_request:
+    paths:
+      - "backend/**"
+      - "docker-compose.yml"
+      - ".forgejo/workflows/backend.yml"
   workflow_dispatch:
 
-	env:
-  # Container Registry
-  REGISTRY_URL: ${{ vars.CONTAINER_REGISTRY }}
-  REGISTRY_USERNAME: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
-  REGISTRY_PASSWORD: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
+permissions:
+  contents: read
 
-  # Docker Image
-  WEB_IMAGE_NAME: chamomind/ecourt-note
-  IMAGE_TAG: ${{ github.ref_name }}
-
-  # SSH Deployment
+env:
+  REGISTRY: ${{ vars.CONTAINER_REGISTRY || 'ghcr.io' }}
+  IMAGE_NAME: ${{ vars.IMAGE_NAMESPACE }}/word-versioning-backend
+  IMAGE_TAG: ${{ github.ref_name || 'latest' }}
   DEPLOY_HOST: ${{ vars.SSH_DEPLOY_HOST }}
   DEPLOY_USER: ${{ vars.SSH_DEPLOY_USER }}
 
-  # Notifications
-  DISCORD_WEBHOOK_URL: ${{ vars.DISCORD_WEBHOOK_URL }}
-  NEXT_PUBLIC_APP_URL: ${{ vars.NEXT_PUBLIC_APP_URL }}
-
 jobs:
   build-and-test:
     name: Build and test backend
     runs-on: ubuntu-latest
     timeout-minutes: 30
     env:
-      DOTNET_CLI_TELEMETRY_OPTOUT: '1'
+      DOTNET_CLI_TELEMETRY_OPTOUT: "1"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -38,7 +42,7 @@ jobs:
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '8.0.x'
+          dotnet-version: "8.0.x"
 
       - name: Restore solution
         run: dotnet restore backend/WordVersioning.slnx
@@ -48,3 +52,51 @@ jobs:
 
       - name: Run tests
         run: dotnet test backend/WordVersioning.slnx --configuration Release --no-build --logger "trx;LogFileName=backend-tests.trx"
+
+  docker-build:
+    name: Build and push backend image
+    needs: build-and-test
+    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to container registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
+          password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
+
+      - name: Build and push backend image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./backend/WordVersioning.Api/Dockerfile
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
+
+  deploy:
+    name: Deploy backend container
+    needs: docker-build
+    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy over SSH
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            set -e
+            echo "${{ secrets.CONTAINER_REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u "${{ vars.CONTAINER_REGISTRY_USERNAME }}" --password-stdin
+            docker pull ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_TAG }}
+            docker compose -f /opt/word-versioning/docker-compose.prod.yml up -d api
+            docker image prune -f

.forgejo/workflows/deploy.yml

@@ -0,0 +1,99 @@
+name: Deploy Containers
+
+on:
+  push:
+    tags:
+      - "addin-*.*.*"
+      - "backend-*.*.*"
+      - "web-*.*.*"
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+env:
+  REGISTRY: ${{ vars.CONTAINER_REGISTRY || 'ghcr.io' }}
+  BACKEND_IMAGE: ${{ vars.IMAGE_NAMESPACE }}/word-versioning-backend
+  WEB_IMAGE: ${{ vars.IMAGE_NAMESPACE }}/word-versioning-web
+  BACKEND_TAG: ${{ github.ref_name || 'latest' }}
+  WEB_TAG: ${{ github.ref_name || 'latest' }}
+  DEPLOY_HOST: ${{ vars.SSH_DEPLOY_HOST }}
+  DEPLOY_USER: ${{ vars.SSH_DEPLOY_USER }}
+
+jobs:
+  build-and-push-backend:
+    name: Build and push backend image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
+          password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
+
+      - name: Build backend image
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./backend/WordVersioning.Api/Dockerfile
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE }}:${{ env.BACKEND_TAG }}
+            ${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE }}:latest
+
+  build-and-push-web:
+    name: Build and push web image
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ vars.CONTAINER_REGISTRY_USERNAME }}
+          password: ${{ secrets.CONTAINER_REGISTRY_PASSWORD }}
+
+      - name: Build web image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./web
+          file: ./web/Dockerfile
+          push: true
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.WEB_IMAGE }}:${{ env.WEB_TAG }}
+            ${{ env.REGISTRY }}/${{ env.WEB_IMAGE }}:latest
+
+  deploy:
+    name: Deploy to remote host
+    needs:
+      - build-and-push-backend
+      - build-and-push-web
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy via SSH
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ env.DEPLOY_HOST }}
+          username: ${{ env.DEPLOY_USER }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
+          script: |
+            set -e
+            echo "${{ secrets.CONTAINER_REGISTRY_PASSWORD }}" | docker login ${{ env.REGISTRY }} -u "${{ vars.CONTAINER_REGISTRY_USERNAME }}" --password-stdin
+            export BACKEND_IMAGE="${{ env.REGISTRY }}/${{ env.BACKEND_IMAGE }}:${{ env.BACKEND_TAG }}"
+            export WEB_IMAGE="${{ env.REGISTRY }}/${{ env.WEB_IMAGE }}:${{ env.WEB_TAG }}"
+            cd /opt/word-versioning
+            docker compose -f docker-compose.prod.yml pull
+            docker compose -f docker-compose.prod.yml up -d --remove-orphans
+            docker image prune -f

.forgejo/workflows/web.yml

@@ -5,15 +5,17 @@ on:
     branches:
       - main
       - master
+    tags:
+      - "web-*.*.*"
     paths:
-      - 'web/**'
-      - 'docker-compose.yml'
-      - '.forgejo/workflows/web.yml'
+      - "web/**"
+      - "docker-compose.yml"
+      - ".forgejo/workflows/web.yml"
   pull_request:
     paths:
-      - 'web/**'
-      - 'docker-compose.yml'
-      - '.forgejo/workflows/web.yml'
+      - "web/**"
+      - "docker-compose.yml"
+      - ".forgejo/workflows/web.yml"
 
 permissions:
   contents: read
@@ -33,7 +35,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: '20'
+          node-version: "20"
 
       - name: Install dependencies
         run: npm install --no-fund --no-audit