Merge pull request #64 from FaserF/improved-fixed-docker-web

Docker Web improvements & better security

Author: github-actions[bot]

.github/scripts/generate_release_version.py

@@ -73,7 +73,7 @@ def main():
     args = parser.parse_args()
 
     # Fallback version if version generation fails
-    FALLBACK_VERSION = "2026.1.4"
+    FALLBACK_VERSION = "2026.1.5"
 
     try:
         base_ver = get_current_date_version()

.github/workflows/ci-orchestrator.yml

@@ -100,7 +100,7 @@ jobs:
       component: backend
 
   test-e2e:
-    needs: [lint, decision]
+    needs: [lint, decision, test-backend]
     if: needs.decision.outputs.run_e2e == 'true'
     uses: ./.github/workflows/test.yml
     with:

.github/workflows/deploy-docs.yml

@@ -11,7 +11,7 @@ on:
   workflow_dispatch:
 
 permissions:
-  contents: read
+  contents: write
   pages: write
   id-token: write
 
@@ -214,18 +214,12 @@ jobs:
         env:
           BASE_URL: /
 
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v4
+      - name: Upload to gh-pages
+        uses: JamesIves/github-pages-deploy-action@v4
         with:
-          path: docs/.vitepress/dist
-
-  deploy:
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
+          folder: docs/.vitepress/dist
+          branch: gh-pages
+          clean: true
+          # Preserve the pr-preview directory
+          clean-exclude: |
+            pr-preview/

.github/workflows/docs_preview.yml

@@ -28,6 +28,56 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Set up Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: '3.13'
+
+      - name: Install Python Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install .[test]
+          pip install Pillow
+
+      - name: Pre-install Addons (Web)
+        run: |
+           mkdir -p src/switchcraft/addons
+           python -c "import zipfile, os, glob; from pathlib import Path; [zipfile.ZipFile(z).extractall(Path('src/switchcraft/addons') / Path(z).stem.replace('switchcraft_', '')) for z in glob.glob('src/switchcraft/assets/addons/*.zip')]"
+
+      - name: Build Web Demo
+        run: |
+          python scripts/prepare_web_dist.py --bake
+          mkdir -p build_web
+          cp -r src/switchcraft build_web/
+
+          PR_NUMBER=${{ github.event.pull_request.number }}
+          cat > build_web/web_entry.py <<EOF
+          import os
+          import sys
+          import flet as ft
+          # WASM compatibility patches
+          if sys.platform == "emscripten":
+              import pyodide_http
+              pyodide_http.patch_all()
+          sys.path.insert(0, os.getcwd())
+          import switchcraft
+          switchcraft.IS_DEMO = True
+          import switchcraft.main
+          if __name__ == "__main__":
+              ft.run(switchcraft.main.main, assets_dir="assets")
+          EOF
+
+          cd build_web
+          # Simplified publish for preview - use the PR specific base-url
+          flet publish web_entry.py --app-name "SwitchCraft Demo PR-$PR_NUMBER" --base-url "/pr-preview/pr-$PR_NUMBER/demo/" --distpath ../dist --assets switchcraft/assets
+          cd ..
+
+          python scripts/prepare_web_dist.py --patch dist
+          rm -rf docs/public/demo
+          mkdir -p docs/public/demo
+          cp -r dist/* docs/public/demo/
+        shell: bash
+
       - name: Setup Node
         uses: actions/setup-node@v6
         with:
@@ -36,8 +86,13 @@ jobs:
           cache-dependency-path: docs/package-lock.json
 
       - name: Install dependencies
-        run: npm ci
-        working-directory: docs
+        run: |
+          cd docs
+          if [ -f package-lock.json ]; then
+            npm ci
+          else
+            npm install vitepress vue
+          fi
 
       - name: Build Docs
         run: npm run docs:build
@@ -52,15 +107,24 @@ jobs:
           preview-branch: gh-pages
           umbrella-dir: pr-preview
           action: auto
+          comment: |
+            🚀 **PR Preview is ready!**
+
+            - 📄 [Documentation Preview](https://switchcraft.fabiseitz.de/pr-preview/pr-${{ github.event.pull_request.number }}/)
+            - 🎮 [Web Demo Preview](https://switchcraft.fabiseitz.de/pr-preview/pr-${{ github.event.pull_request.number }}/demo/)
+
+            *Built with love and GitHub Actions.*
 
   cleanup-preview:
     runs-on: ubuntu-latest
     if: github.event.action == 'closed'
     steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
       - name: Cleanup Preview
         uses: rossjrw/pr-preview-action@v1
         with:
-          source-dir: docs/.vitepress/dist # Not used for cleanup but required by action validation sometimes
           preview-branch: gh-pages
           umbrella-dir: pr-preview
-          action: remove
+          action: delete

.github/workflows/release.yml

@@ -72,6 +72,9 @@ jobs:
           sed -i "s/\"version\": \".*\"/\"version\": \"$VERSION\"/" src/switchcraft_ai/manifest.json
           sed -i "s/\"version\": \".*\"/\"version\": \"$VERSION\"/" src/switchcraft_winget/manifest.json
 
+          # JSON-safe update for main asset manifest
+          python -c "import json, os; p='src/switchcraft/assets/manifest.json'; d=json.load(open(p)) if os.path.exists(p) else {}; d.update({'version': os.environ['VERSION'], 'description': 'SwitchCraft - Enterprise Application Management'}); json.dump(d, open(p, 'w'), indent=4)"
+
 
           # Update .iss files (Inno Setup installer scripts)
           # Extract numeric version only (remove .dev0, +build, etc.) for VersionInfoVersion
@@ -125,7 +128,7 @@ jobs:
           git config --global user.name "github-actions[bot]"
           git config --global user.email "github-actions[bot]@users.noreply.github.com"
 
-          git add pyproject.toml src/switchcraft/__init__.py file_version_info.txt switchcraft.iss switchcraft_legacy.iss src/switchcraft_advanced/manifest.json src/switchcraft_ai/manifest.json src/switchcraft_winget/manifest.json
+          git add pyproject.toml src/switchcraft/__init__.py file_version_info.txt switchcraft.iss switchcraft_legacy.iss src/switchcraft_advanced/manifest.json src/switchcraft_ai/manifest.json src/switchcraft_winget/manifest.json src/switchcraft/assets/manifest.json
 
 
           # Only commit if there are changes

.github/workflows/test.yml

@@ -55,7 +55,7 @@ jobs:
         if: steps.should_run.outputs.should_run == 'true'
         run: |
           python -m pip install --upgrade pip
-          pip install .[test,gui,desktop]
+          pip install .[test,gui,desktop,web-server]
 
       - name: Run All Python Tests
         if: steps.should_run.outputs.should_run == 'true'
@@ -121,7 +121,7 @@ jobs:
       - name: Install Dependencies
         run: |
            python -m pip install --upgrade pip
-           pip install .[test,gui,desktop]
+           pip install .[test,gui,desktop,web-server]
            pip install pytest-asyncio
 
       - name: Run E2E Integration Tests

Dockerfile

@@ -16,9 +16,8 @@ COPY pyproject.toml .
 COPY README.md .
 COPY src ./src
 
-# Install dependencies (Modern Flet only)
-# Note: We omit 'gui' (Legacy Tkinter) to avoid system package requirements
-RUN pip install --no-cache-dir .[modern]
+# Install dependencies (Modern Flet + Web Server + Web WASM)
+RUN pip install --no-cache-dir .[modern,web-server] flet-web packaging
 
 # Generate Addons (Pre-installed)
 RUN python src/generate_addons.py
@@ -42,5 +41,5 @@ ENV SC_DISABLE_WINGET_INSTALL=1
 # Create symlink for assets so Flet can find them at /app/assets
 RUN ln -s /app/src/switchcraft/assets /app/assets
 
-# Command to run the application in web mode
-CMD ["flet", "run", "--web", "--port", "8080", "--host", "0.0.0.0", "src/switchcraft/main.py"]
+# Command to run the application using the Auth Proxy Server
+CMD ["uvicorn", "switchcraft.server.app:app", "--host", "0.0.0.0", "--port", "8080"]

docker-compose.yml

@@ -0,0 +1,24 @@
+services:
+  switchcraft-web:
+    build: .
+    image: switchcraft-web:latest
+    container_name: switchcraft-web
+    ports:
+      - "8080:8080"
+    volumes:
+      - switchcraft_data:/root/.switchcraft
+    environment:
+      - SC_CLIENT_ID=${SC_CLIENT_ID}
+      - SC_CLIENT_SECRET=${SC_CLIENT_SECRET}
+      - SC_AUTH_PROVIDER=${SC_AUTH_PROVIDER:-entra}
+      - SC_ENTRA_CLIENT_ID=${SC_ENTRA_CLIENT_ID}
+      - SC_ENTRA_CLIENT_SECRET=${SC_ENTRA_CLIENT_SECRET}
+      - SC_ENTRA_TENANT_ID=${SC_ENTRA_TENANT_ID}
+      - SC_GITHUB_CLIENT_ID=${SC_GITHUB_CLIENT_ID}
+      - SC_GITHUB_CLIENT_SECRET=${SC_GITHUB_CLIENT_SECRET}
+      - SC_BASE_URL=${SC_BASE_URL}
+      - SC_DISABLE_WINGET_INSTALL=1
+    restart: unless-stopped
+
+volumes:
+  switchcraft_data:

docs/.vitepress/config.mts

@@ -11,7 +11,7 @@ export default defineConfig({
     lang: 'en-US',
 
     head: [
-        ['link', { rel: 'icon', href: '/favicon.ico' }],
+        ['link', { rel: 'icon', href: (process.env.BASE_URL || '/') + 'favicon.ico' }],
         ['meta', { name: 'theme-color', content: '#6366f1' }],
         ['meta', { name: 'og:type', content: 'website' }],
         ['meta', { name: 'og:title', content: 'SwitchCraft Documentation - The Ultimate Packaging Assistant' }],
@@ -97,7 +97,8 @@ export default defineConfig({
                         { text: 'OMA-URI Reference', link: '/Intune_Configuration_Guide' },
                         { text: 'GPO / ADMX Policies', link: '/PolicyDefinitions/README' },
                         { text: 'Registry Settings', link: '/Registry' },
-                        { text: 'Security Guide', link: '/SECURITY' }
+                        { text: 'Security Guide', link: '/SECURITY' },
+                        { text: 'Docker Self-Hosting', link: '/docker_setup' }
                     ]
                 },
                 {