Simplify Docker build workflow and update routing rules

.gitea/workflows/build.yml

@@ -24,21 +24,13 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.TOKEN }}
 
-      - name: Extract metadata for web image
-        id: meta-web
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ vars.PACKAGES_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/web
-
       - name: Build and push web image
         uses: docker/build-push-action@v5
         with:
           context: ./web
           file: ./web/Dockerfile
-          tags: ${{ steps.meta-web.outputs.tags }}
+          tags: ${{ vars.PACKAGES_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/web:${{ gitea.ref_name }}
-          labels: ${{ steps.meta-web.outputs.labels }}
+          push: true
-          cache-from: type=registry,ref=${{ vars.PACKAGES_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/web:buildcache
-          cache-to: type=registry,ref=${{ vars.PACKAGES_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/web:buildcache,mode=max
 
   build-api:
     runs-on: ubuntu-latest
@@ -56,18 +48,10 @@ jobs:
           username: ${{ secrets.USERNAME }}
           password: ${{ secrets.TOKEN }}
 
-      - name: Extract metadata for api image
-        id: meta-api
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ vars.PACKAGES_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/api
-
       - name: Build and push api image
         uses: docker/build-push-action@v5
         with:
           context: ./api
           file: ./api/Dockerfile
-          tags: ${{ steps.meta-api.outputs.tags }}
+          tags: ${{ vars.PACKAGES_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/api:${{ gitea.ref_name }}
-          labels: ${{ steps.meta-api.outputs.labels }}
+          push: true
-          cache-from: type=registry,ref=${{ vars.PACKAGES_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/api:buildcache
-          cache-to: type=registry,ref=${{ vars.PACKAGES_REGISTRY || gitea.server_url }}/${{ gitea.repository }}/api:buildcache,mode=max

adc.yaml

@@ -17,7 +17,7 @@ services:
         vars:
           - - uri
             - "~~"
-            - "^(?!/api|/docs)"
+            - "^(?!/api)"
         priority: 1
         plugins:
           redirect:
@@ -35,15 +35,6 @@ services:
           port: 80
           weight: 100
     routes:
-      - name: nginx-api-docs-route
-        uris:
-          - /docs
-          - /docs/*
-        priority: 30
-        plugins:
-          redirect:
-            http_to_https: true
-
       - name: nginx-api-llm-route
         uris:
           - /api/llm

api/Dockerfile

@@ -6,6 +6,7 @@ WORKDIR /app
 RUN pip install --no-cache-dir fastapi uvicorn[standard] pydantic
 
 # Copy application
+COPY db.json .
 COPY main.py .
 
 # Expose port

helm/api7ee-demo-k8s/templates/configmap-adc.yaml

@@ -27,7 +27,7 @@ data:
             vars:
               - - uri
                 - "~~"
-                - "^(?!/api|/docs)"
+                - "^(?!/api)"
             priority: 1
             plugins:
               {{- if .Values.api7.tls.enabled }}
@@ -47,17 +47,6 @@ data:
               port: 80
               weight: 100
         routes:
-          - name: nginx-api-docs-route
-            uris:
-              - /docs
-              - /docs/*
-            priority: 30
-            plugins:
-              {{- if .Values.api7.tls.enabled }}
-              redirect:
-                http_to_https: true
-              {{- end }}
-
           - name: nginx-api-llm-route
             uris:
               - /api/llm

web/Dockerfile

@@ -11,6 +11,7 @@ RUN pip install --no-cache-dir -r requirements.txt
 # Copy application and documentation
 COPY main.py .
 COPY docs/ ./docs/
+COPY static/ ./static/
 COPY mkdocs.yml .
 
 # Build documentation during image build