try to fix ganymede build

added rtmp module to nginx image
2025-12-23 22:01:43 +08:00 · 2025-12-23 22:01:43 +08:00
65 changed files with 219 additions and 10261 deletions
@@ -1,34 +0,0 @@
-name: CI
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'agentmail-mcp/*'
-      - '.gitea/workflows/build-agentmail-mcp.yaml'      
-jobs:
-  "Build agentmail-mcp docker images":
-    runs-on: woryzen
-    steps:
-      -
-        name: Login to Gitea container registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.woggioni.net
-          username: woggioni
-          password: ${{ secrets.PUBLISHER_TOKEN }}
-      -
-        name: Build and push agentmail-mcp images
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:agentmail-mcp"
-          build-args: |
-            VERSION=0.3.0
-          platforms: |
-            linux/amd64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/agentmail-mcp:latest"
-            "gitea.woggioni.net/woggioni/agentmail-mcp:0.3.0"
-
@@ -7,8 +7,13 @@ on:
      - '.gitea/workflows/build-arch-builder.yaml'      
 jobs:
  "Build arch-builder docker images":
-    runs-on: woryzen
+    runs-on: hostinger
    steps:
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
      -
        name: Login to Gitea container registry
        uses: docker/login-action@v3
@@ -20,95 +25,64 @@ jobs:
        name: Build and push arch-builder base images
        uses: docker/build-push-action@v6
        with:
-          builder: multiplatform-builder
          context: "{{defaultContext}}:arch-builder"
          platforms: linux/amd64
          push: true
          pull: true
          tags: |
            "gitea.woggioni.net/woggioni/arch-builder:base"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:base-buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:base-buildx          
          target: base
-      -
-        name: Build and push arch-builder openwrt-builder images
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:arch-builder"
-          platforms: linux/amd64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/arch-builder:openwrt-builder"
-          target: openwrt-builder
      -
        name: Build and push arch-builder kernel images
        uses: docker/build-push-action@v6
        with:
-          builder: multiplatform-builder
          context: "{{defaultContext}}:arch-builder"
          platforms: linux/amd64
          push: true
          pull: true
          tags: |
            "gitea.woggioni.net/woggioni/arch-builder:kernel"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:kernel-buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:kernel-buildx          
          target: kernel
      -
        name: Build and push arch-builder rust images
        uses: docker/build-push-action@v6
        with:
-          builder: multiplatform-builder
          context: "{{defaultContext}}:arch-builder"
          platforms: linux/amd64
          push: true
          pull: true
          tags: |
            "gitea.woggioni.net/woggioni/arch-builder:rust"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:rust-buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:rust-buildx          
          target: rust
      -
        name: Build and push arch-builder rust full images
        uses: docker/build-push-action@v6
        with:
-          builder: multiplatform-builder
          context: "{{defaultContext}}:arch-builder"
          platforms: linux/amd64
          push: true
          pull: true
          tags: |
            "gitea.woggioni.net/woggioni/arch-builder:rust-full"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:rust-full-buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:rust-full-buildx          
          target: rust-full
      -
-        name: Build and push arch-builder rust sccache images
+        name: Build and push arch-builder gitea_act_runner images
        uses: docker/build-push-action@v6
        with:
-          builder: multiplatform-builder
          context: "{{defaultContext}}:arch-builder"
          platforms: linux/amd64
          push: true
          pull: true
          tags: |
-            "gitea.woggioni.net/woggioni/arch-builder:rust-sccache"
-          target: rust-sccache
-      -
-        name: Build and push arch-builder rust full sccache  images
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:arch-builder"
-          platforms: linux/amd64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/arch-builder:rust-full-sccache"
-          target: rust-full-sccache
-      -
-        name: Build and push arch-builder gitea-runner images
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:arch-builder"
-          platforms: linux/amd64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/arch-builder:gitea-runner"
-          target: gitea-runner
+            "gitea.woggioni.net/woggioni/arch-builder:gitea_act_runner"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/arch-builder:gitea-buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/arch-builder:gitea-buildx          
+          target: gitea_act_runner
@@ -6,53 +6,30 @@ on:
      - 'bee-dashboard/**'
      - '.gitea/workflows/build-bee-dashboard.yaml'      
 jobs:
-  node-build:
-    runs-on: hostinger
-    container:
-      image: gitea.woggioni.net/woggioni/gitea-runner/pnpm:latest
+  "Build & deploy Cloudflare page":
+    runs-on: woryzen
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v6
+        uses: actions/checkout@v4
        with:
          path: docker-images
      - name: Checkout bee-dashboard sources
-        run: git clone -b v0.35.1 --depth 1 https://gitea.woggioni.net/woggioni/bee-dashboard.git src
-      - name: Prepare build
-        run: pnpm install --frozen-lockfile
-        working-directory: ./src
+        run: /usr/sbin/git clone -b 0.33.3 --depth 1 https://github.com/woggioni/bee-dashboard.git src
      - name: Execute build
-        run: pnpm run build
-        working-directory: ./src
+        run: cd src && npm install
      - name: Copy _headers file
        run: cp docker-images/bee-dashboard/_headers src/build
-      - name: Compress static HTML assets
-        run: find src/build -name "*.html" -type f -exec gzip -k -9 {} \;
-      - name: Compress static JS assets
-        run: find src/build -name "*.js" -type f -exec gzip -k -9 {} \;
-      - name: Compress static CSS assets
-        run: find src/build -name "*.css" -type f -exec gzip -k -9 {} \;
      - name: Create archive
        run: tar -czf docker-images/bee-dashboard/bee-dashboard.tar -C src/build .
-      - name: Upload folder as artifact
-        uses: actions/upload-artifact@v3
+      - name: Publish archive to gitea.woggioni.net
+        run: curl --user woggioni:${{ secrets.PUBLISHER_TOKEN }} --upload-file docker-images/bee-dashboard/bee-dashboard.tar https://gitea.woggioni.net/api/packages/woggioni/generic/bee-dashboard/0.33.3/bee-dashboard.tar
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.4.0
        with:
-          name: bee-dashboard.tar
-          path: docker-images/bee-dashboard/bee-dashboard.tar
-      # - name: Publish archive to gitea.woggioni.net
-      #   run: curl --user woggioni:${{ secrets.PUBLISHER_TOKEN }} --upload-file docker-images/bee-dashboard/bee-dashboard.tar https://gitea.woggioni.net/api/packages/woggioni/generic/bee-dashboard/0.35.1/bee-dashboard.tar
-  docker-build:
-    runs-on: hostinger
-    needs: node-build
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v6
-        with:
-          path: docker-images
-      - name: Download artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: bee-dashboard.tar
-          path: docker-images/bee-dashboard
+          driver: docker-container
+          platforms: |
+            linux/amd64
+            linux/arm64
      - name: Login to Gitea container registry
        uses: docker/login-action@v3
        with:
@@ -62,32 +39,20 @@ jobs:
      - name: Build and push bee-dashboard images
        uses: docker/build-push-action@v6
        with:
-          context: "docker-images/bee-dashboard"
-          builder: multiplatform-builder
          platforms: |
            linux/amd64
            linux/arm64
+          context: "docker-images/bee-dashboard"
          push: true
          pull: true
-          build-args: "VERSION=0.35.1"
+          ssh: default=/home/luser/.ssh/id_ed25519
+          build-args: "VERSION=0.33.3"
          tags: |
-            "gitea.woggioni.net/woggioni/bee-dashboard:0.35.1"
-  deploy:
-    runs-on: hostinger
-    needs: node-build
-    container:
-      image: node:26-alpine
-    steps:
-      - name: Download artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: bee-dashboard.tar
-          path: .
-      - run: mkdir build
-      - name: Extract artifact
-        run: tar -C build -xf /workspace/woggioni/docker-images/bee-dashboard.tar
+            "gitea.woggioni.net/woggioni/bee-dashboard:0.33.3"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/bee-dashboard:buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/bee-dashboard:buildx          
      - name: Deploy to Cloudflare
-        run: npx wrangler pages deploy --project-name bee-dashboard --branch main build
+        run: npx wrangler pages deploy --project-name bee-dashboard --branch main src/build
        env:
          CLOUDFLARE_ACCOUNT_ID: ${{ vars.CLOUDFLARE_ACCOUNT_ID }}
          CLOUDFLARE_API_TOKEN: ${{ secrets.CLOUDFLARE_API_TOKEN }}
@@ -1,94 +0,0 @@
-name: CI
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'gitea-runner/*'
-      - '.gitea/workflows/build-gitea-runner.yaml'      
-jobs:
-  "Build Gitea runner docker images":
-    runs-on: hostinger
-    steps:
-      -
-        name: Login to Gitea container registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.woggioni.net
-          username: woggioni
-          password: ${{ secrets.PUBLISHER_TOKEN }}
-      -
-        name: Build and push runner image
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:gitea-runner"
-          target: runner
-          build-args: "ALPINE_VERSION=3.24"
-          platforms: |
-            linux/amd64
-            linux/arm64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/gitea-runner:latest"
-
-      -
-        name: Build and push debian image
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:gitea-runner"
-          target: debian
-          build-args: "DEBIAN_VERSION=13"
-          platforms: |
-            linux/amd64
-            linux/arm64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/gitea-runner/debian:13"
-            "gitea.woggioni.net/woggioni/gitea-runner/debian:latest"
-      -
-        name: Build and push ubuntu image
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:gitea-runner"
-          target: ubuntu
-          build-args: "UBUNTU_VERSION=26.04"
-          platforms: |
-            linux/amd64
-            linux/arm64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/gitea-runner/ubuntu:26.04"
-            "gitea.woggioni.net/woggioni/gitea-runner/ubuntu:latest"
-      -
-        name: Build and push archlinux image
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:gitea-runner"
-          target: archlinux
-          platforms: |
-            linux/amd64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/gitea-runner/archlinux:latest"
-      -
-        name: Build and push pnpm image
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:gitea-runner"
-          target: pnpm
-          build-args: "ALPINE_VERSION=3.24"
-          platforms: |
-            linux/amd64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/gitea-runner/pnpm:latest"
-
@@ -7,8 +7,13 @@ on:
      - '.gitea/workflows/build-jenkins-agent.yaml'      
 jobs:
  "Build jenkins-agent docker images":
-    runs-on: woryzen
+    runs-on: hostinger
    steps:
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.4.0
+        with:
+          driver: docker-container
      -
        name: Login to Gitea container registry
        uses: docker/login-action@v3
@@ -20,10 +25,11 @@ jobs:
        name: Build and push jenkins-agent images
        uses: docker/build-push-action@v6
        with:
-          builder: default
          context: "{{defaultContext}}:jenkins-agent"
          push: true
          pull: true
          tags: |
            "gitea.woggioni.net/woggioni/jenkins-agent:latest"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/jenkins-agent:buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/jenkins-agent:buildx          

@@ -9,6 +9,14 @@ jobs:
  "Build Jupyter Sage docker images":
    runs-on: woryzen
    steps:
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+        with:
+          driver: docker-container
      -
        name: Login to Gitea container registry
        uses: docker/login-action@v3
@@ -20,12 +28,10 @@ jobs:
        name: Build and push jupyter-sage image
        uses: docker/build-push-action@v5.3.0
        with:
-          builder: multiplatform-builder
          context: "{{defaultContext}}:jupyter-sage"
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64
          push: true
-          build-args: "VERSION=10.8"
-          ssh: default=/home/luser/.ssh/id_ed25519
-          tags: |
-            gitea.woggioni.net/woggioni/jupyter-sage:latest
-            gitea.woggioni.net/woggioni/jupyter-sage:10.8
+          pull: true
+          tags: gitea.woggioni.net/woggioni/jupyter-sage:latest
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/jupyter-sage:buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/jupyter-sage:buildx          
@@ -1,35 +0,0 @@
-
-name: CI
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'monerod/*'
-      - '.gitea/workflows/build-monerod.yaml'      
-jobs:
-  "Build monerod docker images":
-    runs-on: woryzen
-    steps:
-      -
-        name: Login to Gitea container registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.woggioni.net
-          username: woggioni
-          password: ${{ secrets.PUBLISHER_TOKEN }}
-      -
-        name: Build and push monerod images
-        uses: docker/build-push-action@v6
-        with:
-          context: "{{defaultContext}}:monerod"
-          builder: multiplatform-builder
-          platforms: |
-            linux/amd64
-            linux/arm64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/monerod:latest"
-            "gitea.woggioni.net/woggioni/monerod:0.18.4.5"
-            
-
@@ -7,7 +7,7 @@ on:
      - '.gitea/workflows/build-nginx.yaml'      
 jobs:
  "Build nginx docker images":
-    runs-on: kvm4
+    runs-on: woryzen
    steps:
      -
        name: Login to Gitea container registry
@@ -25,20 +25,20 @@ jobs:
          platforms: |
            linux/amd64
            linux/arm64
-            linux/arm/v7
          push: true
          pull: true
-          ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519
+          ssh: default=/home/luser/.ssh/id_ed25519
          tags: |
            "gitea.woggioni.net/woggioni/nginx:latest"
-            "gitea.woggioni.net/woggioni/nginx:v1.31.3"
+            "gitea.woggioni.net/woggioni/nginx:v1.29.4"
          secrets: |
            GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
          build-args: |
-            LIBRESSL_VERSION=4.3.2
-            NGINX_VERSION=1.31.3
-            NJS_VERSION=0.9.8
+            LIBRESSL_VERSION=4.2.1
+            NGINX_VERSION=1.29.4
            NGINX_BRANCH=vanilla
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx-vanilla
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx-vanilla
      -
        name: Build and push nginx custom images
        uses: docker/build-push-action@v6
@@ -48,17 +48,17 @@ jobs:
          platforms: |
            linux/amd64
            linux/arm64
-            linux/arm/v7
          push: true
          pull: true
-          ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519
+          ssh: default=/home/luser/.ssh/id_ed25519
          tags: |
            "gitea.woggioni.net/woggioni/nginx:woggioni"
-            "gitea.woggioni.net/woggioni/nginx:v1.31.3-woggioni"
+            "gitea.woggioni.net/woggioni/nginx:v1.29.4-woggioni"
          secrets: |
            GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
          build-args: |
-            LIBRESSL_VERSION=4.3.2
-            NGINX_VERSION=1.31.3
-            NJS_VERSION=0.9.8
+            LIBRESSL_VERSION=4.2.1
+            NGINX_VERSION=1.29.4
            NGINX_BRANCH=woggioni
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/nginx:buildx-woggioni
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/nginx:buildx-woggioni
@@ -1,55 +0,0 @@
-
-name: CI
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'opencode/*'
-      - '.gitea/workflows/build-opencode.yaml'      
-jobs:
-  "Build opencode docker images":
-    runs-on: hostinger
-    steps:
-      -
-        name: Login to Gitea container registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.woggioni.net
-          username: woggioni
-          password: ${{ secrets.PUBLISHER_TOKEN }}
-      -
-        name: Build and push opencode binary images
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:opencode"
-          ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519
-          target: release-bin
-          build-args: |
-            OPENCODE_VERSION=1.18.10
-            BUN_VERSION=1.3.14
-          platforms: |
-            linux/amd64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/opencode:1.18.10-bin"
-            "gitea.woggioni.net/woggioni/opencode:1.18.10"
-            "gitea.woggioni.net/woggioni/opencode:latest"
-      -
-        name: Build and push opencode build-from-source images
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:opencode"
-          ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519
-          target: release
-          build-args: |
-            OPENCODE_VERSION=1.18.10
-            BUN_VERSION=1.3.14
-          platforms: |
-            linux/amd64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/opencode:1.18.10-bfs"
@@ -1,38 +0,0 @@
-name: CI
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'otel-lgtm/**'
-      - '.gitea/workflows/build-otel-lgtm.yaml'      
-jobs:
-  "Build otel-lgtm docker images":
-    runs-on: hostinger
-    steps:
-      -
-        name: Login to Gitea container registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.woggioni.net
-          username: woggioni
-          password: ${{ secrets.PUBLISHER_TOKEN }}
-      -
-        name: Build and push otel-lgtm vanilla images
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:otel-lgtm"
-          platforms: |
-            linux/amd64
-            linux/arm64
-          push: true
-          pull: true
-          ssh: default=/var/lib/gitea-runner/.ssh/id_ed25519
-          tags: |
-            "gitea.woggioni.net/woggioni/otel-lgtm:latest"
-            "gitea.woggioni.net/woggioni/otel-lgtm:0.0.1"
-          secrets: |
-            GIT_AUTH_TOKEN.github.com=${{ secrets.GH_ACCESS_TOKEN }}
-          build-args: |
-            ALPINE_VERSION=3.24
-            OTELCOL_VERSION=0.154.0
@@ -6,9 +6,14 @@ on:
      - 'pgvector/**'
      - '.gitea/workflows/build-pgvector.yaml'      
 jobs:
-  "Build pgvector docker images":
+  "Build wildfly docker images":
    runs-on: woryzen
    steps:
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.4.0
+        with:
+          driver: docker-container
      -
        name: Login to Gitea container registry
        uses: docker/login-action@v3
@@ -20,18 +25,15 @@ jobs:
        name: Build and push pgvector images
        uses: docker/build-push-action@v6
        with:
-          builder: multiplatform-builder
          context: "{{defaultContext}}:pgvector"
          push: true
          pull: true
-          platforms: |
-            linux/amd64
-            linux/arm64
          tags: |
            "gitea.woggioni.net/woggioni/pgvector:latest"
-            "gitea.woggioni.net/woggioni/pgvector:0.8.5-pg18.4-alpine3.24"
+            "gitea.woggioni.net/woggioni/pgvector:0.8.1-pg17"
          build-args: |
-            PG_VERSION=18.4
-            ALPINE_VERSION=3.24
-            PGVECTOR_VERSION=0.8.5
+            PG_VERSION=17
+            PGVECTOR_VERSION=0.8.1
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/pgvector:buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/pgvector:buildx          

@@ -17,17 +17,31 @@ jobs:
          username: woggioni
          password: ${{ secrets.PUBLISHER_TOKEN }}
      -
-        name: Build and push sserver-rust images
+        name: Build and push sserver-rust images amd64
+        uses: docker/build-push-action@v6
+        with:
+          context: "{{defaultContext}}:shadowsocks-rust"
+          platforms: |
+            linux/amd64
+          push: true
+          pull: false
+          ssh: default=/home/luser/.ssh/id_ed25519
+          tags: |
+            "gitea.woggioni.net/woggioni/sserver-rust:latest"
+            "gitea.woggioni.net/woggioni/sserver-rust:v1.24.0"
+          build-args: "VERSION=1.24.0"
+      -
+        name: Build and push sserver-rust images aarch64
        uses: docker/build-push-action@v6
        with:
          builder: multiplatform-builder
          context: "{{defaultContext}}:shadowsocks-rust"
          platforms: |
-            linux/amd64
            linux/arm64
          push: true
          pull: false
          ssh: default=/home/luser/.ssh/id_ed25519
          tags: |
-            "gitea.woggioni.net/woggioni/sserver-rust:dev"
+            "gitea.woggioni.net/woggioni/sserver-rust:latest"
+            "gitea.woggioni.net/woggioni/sserver-rust:v1.24.0"
          build-args: "VERSION=1.24.0"
@@ -1,34 +0,0 @@
-name: CI
-on:
-  push:
-    branches: [ master ]
-    paths:
-      - 'synapse/*'
-      - '.gitea/workflows/build-synapse.yaml'      
-jobs:
-  "Build synapse docker images":
-    runs-on: woryzen
-    steps:
-      -
-        name: Login to Gitea container registry
-        uses: docker/login-action@v3
-        with:
-          registry: gitea.woggioni.net
-          username: woggioni
-          password: ${{ secrets.PUBLISHER_TOKEN }}
-      -
-        name: Build and push synapse images
-        uses: docker/build-push-action@v6
-        with:
-          builder: multiplatform-builder
-          context: "{{defaultContext}}:synapse"
-          build-args: |
-            VERSION=1.154.0
-          platforms: |
-            linux/amd64
-          push: true
-          pull: true
-          tags: |
-            "gitea.woggioni.net/woggioni/synapse:latest"
-            "gitea.woggioni.net/woggioni/synapse:1.154.0"
-
@@ -7,7 +7,7 @@ on:
      - '.gitea/workflows/build-wildfly.yaml'      
 jobs:
  "Build wildfly docker images":
-    runs-on: woryzen
+    runs-on: hostinger
    steps:
      -
        name: Login to Gitea container registry
@@ -26,6 +26,6 @@ jobs:
          pull: true
          tags: |
            "gitea.woggioni.net/woggioni/wildfly:latest"
-            "gitea.woggioni.net/woggioni/wildfly:40.0.0"
-          build-args: "VERSION=40.0.0"
+            "gitea.woggioni.net/woggioni/wildfly:38.0.1"
+          build-args: "VERSION=38.0.1"

@@ -9,6 +9,11 @@ jobs:
  "Build xmrig docker images":
    runs-on: woryzen
    steps:
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.4.0
+        with:
+          driver: docker-container
      -
        name: Login to Gitea container registry
        uses: docker/login-action@v3
@@ -20,16 +25,14 @@ jobs:
        name: Build and push xmrig images
        uses: docker/build-push-action@v6
        with:
-          builder: multiplatform-builder
          context: "{{defaultContext}}:xmrig"
-          platforms: |
-            linux/amd64
-            linux/arm64
          push: true
          pull: true
          ssh: default=/home/luser/.ssh/id_ed25519
          tags: |
            "gitea.woggioni.net/woggioni/xmrig:latest"
-            "gitea.woggioni.net/woggioni/xmrig:6.25.0"
-          build-args: "VERSION=6.25.0"
+            "gitea.woggioni.net/woggioni/xmrig:6.24.0"
+          build-args: "VERSION=6.24.0"
+          cache-from: type=registry,ref=gitea.woggioni.net/woggioni/xmrig:buildx
+          cache-to: type=registry,mode=max,compression=zstd,image-manifest=true,oci-mediatypes=true,ref=gitea.woggioni.net/woggioni/xmrig:buildx          

@@ -1,14 +0,0 @@
-FROM alpine:3.23
-ARG VERSION
-RUN --mount=type=cache,target=/var/cache/apk apk add python3 pipx
-ADD --chmod=755 ./entrypoint.sh /usr/local/bin/entrypoint.sh
-RUN addgroup -S agentmail
-RUN adduser -D -S -h /var/lib/agentmail -G agentmail agentmail
-WORKDIR /var/lib/agentmail
-USER agentmail
-RUN pipx install mcp-streamablehttp-proxy
-RUN pipx install agentmail-mcp==${VERSION}
-ENV SERVER_HOST="0.0.0.0"
-ENV SERVER_PORT="8080"
-
-ENTRYPOINT ["entrypoint.sh"]
@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-if [ -z "${SERVER_HOST}" ]
-then
-  SERVER_HOST="0.0.0.0"
-fi
-if [ -z "${AGENTMAIL_API_KEY}" ]
-then
-  echo "You need to specify an API key setting the environmental variable 'AGENTMAIL_API_KEY'"
-  false
-else
-  exec .local/bin/mcp-streamablehttp-proxy --host ${SERVER_HOST} --port ${SERVER_PORT} .local/bin/agentmail-mcp --api-key ${AGENTMAIL_API_KEY}
-fi
@@ -16,7 +16,6 @@ RUN rm repository.key
 RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm
 RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
    curl \
-    openssh \
    aarch64-unknown-linux-musl-gcc x86_64-unknown-linux-musl-gcc \
    arm-unknown-linux-musleabihf-gcc \
    arm-unknown-linux-musleabi-gcc \
@@ -71,6 +70,7 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
    imagemagick \
    python-sphinx \
    python-yaml \
+    openssh \
    rust \
    rust-src \
    rust-bindgen \
@@ -78,17 +78,14 @@ RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
 USER luser
 WORKDIR /home/luser

-FROM base AS openwrt-builder
-RUN mkdir -p /etc/cargo
-COPY --chown=1000:1000 config.toml /home/luser/.cargo/config.toml
-RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed rustup go rsync wget unzip swig python-setuptools python-pyelftools
-
 FROM base AS rust
 RUN mkdir -p /etc/cargo
 COPY --chown=1000:1000 config.toml /home/luser/.cargo/config.toml
+COPY --chown=1000:1000 sccache_config.toml /home/luser/.config/sccache/config
 RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
    rustup \
    trunk \
+    sccache \
    llvm \
    clang

@@ -111,40 +108,10 @@ RUN rustup target add \
    wasm32-unknown-unknown \
    wasm32-wasip2

-FROM base AS rust-sccache
-RUN mkdir -p /etc/cargo
-COPY --chown=1000:1000 config-sccache.toml /home/luser/.cargo/config.toml
-COPY --chown=1000:1000 sccache_config.toml /home/luser/.config/sccache/config
-RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
-    rustup \
-    trunk \
-    sccache \
-    llvm \
-    clang
-
-FROM rust-sccache AS rust-full-sccache
-RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
-    hidapi \
-    protobuf     
-USER luser
-WORKDIR /home/luser
-RUN rustup update
-RUN rustup toolchain install stable-x86_64-unknown-linux-gnu --profile minimal
-RUN rustup component add rustfmt
-RUN rustup target add \
-    x86_64-unknown-linux-musl \
-    x86_64-unknown-linux-gnu \
-    armv7-unknown-linux-musleabihf \
-    arm-unknown-linux-musleabi \
-    aarch64-unknown-linux-musl \
-    aarch64-unknown-linux-gnu \
-    wasm32-unknown-unknown \
-    wasm32-wasip2
-
-FROM base AS gitea-runner
+FROM base AS gitea_act_runner
 RUN --mount=type=bind,source=woggioni.net.ca.pem,target=/root.pem trust anchor root.pem
 RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed nodejs npm docker docker-buildx btrfs-progs hidapi protobuf rustup llvm clang trunk emscripten sccache
-RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed gitea-runner jdk17-graalvm-ce-bin jdk17-graalvm-bin jdk21-graalvm-bin jdk25-graalvm-bin jdk21-graalvm-ce-bin jdk25-graalvm-ce-bin go
+RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed gitea-act-runner jdk21-graalvm-bin jdk25-graalvm-bin jdk21-graalvm-ce-bin jdk25-graalvm-ce-bin
 RUN usermod -a luser -G docker
 USER luser
 WORKDIR /home/luser
@@ -167,4 +134,4 @@ RUN cargo install worker-build
 RUN cargo install wasm-bindgen-cli
 RUN npm install -D wrangler
 ENV PATH="/home/luser/.local/bin:/home/luser/.cargo/bin:${PATH}"
-CMD ["/usr/bin/gitea-runner", "daemon", "--config", "/var/lib/gitea/runner.yaml"]
+CMD ["/usr/lib/gitea/act_runner/act_runner", "daemon", "--config", "/var/lib/gitea/act_runner.yaml"]
@@ -1,23 +0,0 @@
-[target.aarch64-unknown-linux-musl]
-linker = "/opt/x-tools/aarch64-unknown-linux-musl/bin/aarch64-unknown-linux-musl-ld"
-[target.x86_64-unknown-linux-musl]
-linker = "/opt/x-tools/x86_64-unknown-linux-musl/bin/x86_64-unknown-linux-musl-ld"
-[target.x86_64-pc-windows-gnu]
-linker = "/opt/x-tools/x86_64-w64-mingw32/bin/x86_64-w64-mingw32-gcc"
-[target.armv7-unknown-linux-musleabihf]
-linker = "/opt/x-tools/arm-unknown-linux-musleabihf/bin/arm-unknown-linux-musleabihf-ld"
-
-[registries.gitea]
-global-credential-providers = ["cargo:token"]
-index = "sparse+https://gitea.woggioni.net/api/packages/woggioni/cargo/"
-
-[net]
-git-fetch-with-cli = true
-
-[profile.release]
-opt-level = 3
-lto = true
-strip = true
-
-[build]
-rustc-wrapper = "/usr/bin/sccache"
@@ -18,3 +18,6 @@ git-fetch-with-cli = true
 opt-level = 3
 lto = true
 strip = true
+
+[build]
+rustc-wrapper = "/usr/bin/sccache"
@@ -1,4 +1,4 @@
-FROM gitea.woggioni.net/woggioni/nginx:v1.31.2
+FROM gitea.woggioni.net/woggioni/nginx:v1.29.4
 RUN mkdir /srv/http
 RUN --mount=type=bind,source=bee-dashboard.tar,target=/bee-dashboard.tar tar -xf /bee-dashboard.tar -C /srv/http
 COPY bee-dashboard.conf /etc/nginx/conf.d/http/bee-dashboard.conf
@@ -1,12 +1,6 @@
 server {
    listen 80;
-    listen [::]:80;
-    http2 on;
    root   /srv/http;    
-    gzip_static on;
-    gzip_vary on;
-    gzip off;
-
    location / {
    }
 }
@@ -1,73 +0,0 @@
-ARG ALPINE_VERSION=3.24
-ARG DEBIAN_VERSION=13
-ARG UBUNTU_VERSION=26.04
-FROM alpine:${ALPINE_VERSION} AS runner
-RUN echo "@testing https://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories
-RUN --mount=type=cache,target=/var/cache/apk apk update
-RUN --mount=type=cache,target=/var/cache/apk apk add gitea-runner@testing nodejs docker shadow
-RUN usermod -u 1000 gitea-runner
-RUN addgroup gitea-runner docker
-USER gitea-runner
-WORKDIR /var/lib/gitea-runner
-CMD ["/usr/bin/gitea-runner", "daemon", "--config", "/etc/gitea-runner/config.yaml"]
-
-FROM debian:${DEBIAN_VERSION}-slim AS debian
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    apt update &&\
-    apt install -y nodejs unzip git
-RUN useradd gitea-runner -d /var/lib/gitea-runner -u 1000 -r
-USER gitea-runner
-WORKDIR /var/lib/gitea-runner
-
-FROM ubuntu:${UBUNTU_VERSION} AS ubuntu
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    apt update &&\
-    apt install -y nodejs unzip git
-RUN userdel ubuntu
-RUN useradd gitea-runner -d /var/lib/gitea-runner -u 1000 -r
-USER gitea-runner
-WORKDIR /var/lib/gitea-runner
-
-FROM archlinux:latest AS archlinux
-
-COPY mirrorlist /etc/pacman.d/mirrolist
-RUN pacman-key --init
-#RUN pacman-key --refresh-keys
-
-RUN curl --retry 3 -OJ https://gitea.woggioni.net/api/packages/woggioni/arch/repository.key
-
-RUN pacman-key --add repository.key
-RUN pacman-key --lsign-key 0D28BF66FDB45D18D8EBEE5D4C91DADCD00B3F77
-RUN --mount=type=bind,source=pacman-gitea-repository.conf,target=pacman-gitea-repository.conf cat pacman-gitea-repository.conf  >> /etc/pacman.conf
-
-RUN rm repository.key
-RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm
-RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
-    nodejs \
-    git \
-    aarch64-unknown-linux-musl-gcc x86_64-unknown-linux-musl-gcc \
-    arm-unknown-linux-musleabihf-gcc \
-    arm-unknown-linux-musleabi-gcc \
-    x86_64-unknown-linux-musl-gcc \
-    x86_64-w64-mingw32-gcc \
-    aarch64-unknown-linux-musl-gcc x86_64-unknown-linux-musl-zlib \
-    arm-unknown-linux-musleabihf-zlib \
-    arm-unknown-linux-musleabi-zlib \
-    x86_64-unknown-linux-musl-zlib \
-    x86_64-w64-mingw32-zlib \
-    upx
-RUN ln -s /opt/x-tools/aarch64-unknown-linux-musl/bin/aarch64-unknown-linux-musl-gcc /usr/local/bin/aarch64-linux-musl-gcc 
-RUN ln -s /opt/x-tools/x86_64-unknown-linux-musl/bin/x86_64-unknown-linux-musl-gcc /usr/local/bin/x86_64-linux-musl-gcc
-RUN ln -s /opt/x-tools/arm-unknown-linux-musleabihf/bin/arm-unknown-linux-musleabihf-gcc /usr/local/bin/arm-linux-musleabihf-gcc
-RUN ln -s /opt/x-tools/arm-unknown-linux-musleabihf/bin/arm-unknown-linux-musleabi-gcc /usr/local/bin/arm-linux-musleabi-gcc
-RUN ln -s /opt/x-tools/x86_64-w64-mingw32/bin/x86_64-w64-mingw32-gcc /usr/local/bin/x86_64-pc-windows-gnu-gcc
-RUN useradd gitea-runner -u 1000 -s /bin/bash -m -d /var/lib/gitea-runner
-
-FROM alpine:${ALPINE_VERSION} AS pnpm
-RUN --mount=type=cache,target=/var/cache/apk apk update
-RUN --mount=type=cache,target=/var/cache/apk apk add nodejs shadow git pnpm
-RUN adduser -S -u 1000 -h /var/lib/gitea-runner gitea-runner
-USER gitea-runner
-WORKDIR /var/lib/gitea-runner
@@ -1,15 +0,0 @@
-################################################################################
-################# Arch Linux mirrorlist generated by Reflector #################
-################################################################################
-
-# With:       reflector @/etc/xdg/reflector/reflector.conf
-# When:       2024-07-09 04:16:31 UTC
-# From:       https://archlinux.org/mirrors/status/json/
-# Retrieved:  2024-07-09 04:16:31 UTC
-# Last Check: 2024-07-09 03:46:09 UTC
-
-Server = https://archlinux.thaller.ws/$repo/os/$arch
-Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch
-Server = https://mirror.qctronics.com/archlinux/$repo/os/$arch
-Server = https://mirrors.neusoft.edu.cn/archlinux/$repo/os/$arch
-Server = https://arch.phinau.de/$repo/os/$arch
@@ -1,4 +0,0 @@
-
-[woggioni.gitea.woggioni.net]
-SigLevel = Required
-Server = https://gitea.woggioni.net/api/packages/woggioni/arch/default/x86_64
@@ -1,4 +1,4 @@
-FROM jenkins/agent:3355.v388858a_47b_33-4-alpine3.23-jdk25
+FROM jenkins/agent:3345.v03dee9b_f88fc-2-alpine3.22-jdk21
 USER root
 RUN --mount=type=cache,target=/var/cache/apk apk add docker
 USER jenkins
@@ -27,7 +27,7 @@ USER jovyan
 WORKDIR /home/jovyan
 RUN python -m venv venv
 RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyter-core
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install "notebook<7" jupyterlab
+RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install notebook jupyterlab
 ENV PATH="/home/jovyan/venv/bin/:$PATH"
 RUN --mount=type=bind,from=java-build,src=/home/jovyan/ganymede/ganymede/target/ganymede-2.1.3-SNAPSHOT.jar,target=/home/jovyan/ganymede.jar\
    java -jar /home/jovyan/ganymede.jar -i --copy-jar=true
@@ -1,44 +1,36 @@
-FROM debian:stable AS build
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    apt update &&\
-    apt install -y python3 python3-dev pipx gcc g++ libffi-dev cargo cmake autoconf swig ninja-build patchelf meson python3-faiss adduser
-RUN adduser -u 1000 --system --shell /bin/sh --home /home/jovyan jovyan
+FROM debian:latest
+RUN apt-get update && apt-get upgrade
+RUN apt-get install -y bc binutils bzip2 ca-certificates cliquer cmake curl \
+        ecl eclib-tools fflas-ffpack g++ gap gcc gengetopt gfan gfortran \
+        glpk-utils gmp-ecm lcalc libatomic-ops-dev libboost-dev \
+        libbraiding-dev libbrial-dev libbrial-groebner-dev libbz2-dev \
+        libcdd-dev libcdd-tools libcliquer-dev libcurl4-openssl-dev libec-dev \
+        libecm-dev libffi-dev libflint-dev libfplll-dev libfreetype-dev \
+        libgap-dev libgc-dev libgd-dev libgf2x-dev libgiac-dev libgivaro-dev \
+        libglpk-dev libgmp-dev libgsl-dev libhomfly-dev libiml-dev \
+        liblfunction-dev liblinbox-dev liblrcalc-dev liblzma-dev libm4ri-dev \
+        libm4rie-dev libmpc-dev libmpfi-dev libmpfr-dev libncurses5-dev \
+        libntl-dev libopenblas-dev libpari-dev libplanarity-dev libppl-dev \
+        libprimesieve-dev libpython3-dev libqhull-dev libreadline-dev \
+        librw-dev libsingular4-dev libsqlite3-dev libssl-dev \
+        libsuitesparse-dev libsymmetrica2-dev libz-dev libzmq3-dev m4 make \
+        maxima maxima-sage meson nauty ninja-build openssl palp pari-doc \
+        pari-elldata pari-galdata pari-galpol pari-gp2c pari-seadata patch \
+        patchelf perl pkg-config planarity ppl-dev python3 python3-setuptools \
+        python3-venv singular singular-doc sqlite3 sympow tachyon tar texinfo \
+        tox xcas xz-utils git
+RUN apt-get install -y default-jdk dvipng ffmpeg fonts-freefont-otf \
+        imagemagick latexmk libavdevice-dev libjpeg-dev pandoc tex-gyre \
+        texlive-fonts-recommended texlive-lang-cyrillic texlive-lang-english \
+        texlive-lang-european texlive-lang-french texlive-lang-german \
+        texlive-lang-italian texlive-lang-japanese texlive-lang-polish \
+        texlive-lang-portuguese texlive-lang-spanish texlive-latex-extra \
+        texlive-luatex texlive-xetex xindy
+RUN useradd jovyan -u 1000 -s /bin/bash -m -h /home/jovyan
 USER jovyan
 WORKDIR /home/jovyan
-RUN python3 -m venv venv
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install sagemath
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyter-core
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyterhub
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyterlab
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install notebook
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install ipywidgets
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyterlab-lsp
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install python-lsp-server[yapf,rope,pyflakes] 
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install jupyter-ai
-RUN --mount=type=cache,target=/home/jovyan/.cache/pip,uid=1000,gid=1000 venv/bin/pip install langchain-openai langchain_ollama
-
-ENV PATH="/home/jovyan/venv/bin/:$PATH"
-
-FROM debian:stable
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    apt update &&\
-    apt install -y python3 adduser
-RUN adduser -u 1000 --system --shell /bin/sh --home /home/jovyan jovyan
-USER jovyan
-COPY --from=build /home/jovyan /home/jovyan
-COPY jupyter_server_config.py docker_healthcheck.py /etc/jupyter/
-COPY start-notebook.py start-singleuser.py /usr/local/bin/
-RUN mkdir /home/jovyan/work
-WORKDIR /home/jovyan/work
-ENV JUPYTER_PORT=8888
-EXPOSE $JUPYTER_PORT
-ENV PATH="/home/jovyan/venv/bin/:$PATH"
-CMD ["start-notebook.py"]
-
-# HEALTHCHECK documentation: https://docs.docker.com/engine/reference/builder/#healthcheck
-# This healtcheck works well for `lab`, `notebook`, `nbclassic`, `server`, and `retro` jupyter commands
-# https://github.com/jupyter/docker-stacks/issues/915#issuecomment-1068528799
-HEALTHCHECK --interval=3s --timeout=1s --start-period=3s --retries=3 \
-    CMD /etc/jupyter/docker_healthcheck.py || exit 1
+COPY build.sh build.sh
+RUN git clone -c core.symlinks=true --filter blob:none  \
+    --origin upstream --branch master --tags \
+    https://github.com/sagemath/sage.git
+RUN export srcdir=/home/jovyan/sage source build.sh && prepare && build
@@ -1,18 +1,15 @@
 #!/usr/bin/env sh
-set -e

-# pkgs=(
-#   standard
-#   bliss
-#   coxeter3
-#   mcqd
-#   meataxe
-#   sirocco
-#   tdlib
-# )
+pkgs=(standard
+       bliss
+       coxeter3
+       mcqd
+       meataxe
+       sirocco
+       tdlib)

 prepare(){
-  cd "${srcdir}"
+  cd sage
 # use correct latte-count binary name
 #  patch -p1 -i ../latte-count.patch
 # update to tdlib 0.9 (Fedora)
@@ -26,17 +23,29 @@ prepare() {
 }

 build() {
-  #export SAGE_NUM_THREADS=$(($(nproc)/2))
-  #export PYTHONPATH="$PWD"/sage/pkgs/sage-setup
-  python3 -m build --wheel --no-isolation -C setup-args=-Dbuild-docs=false
+  export SAGE_NUM_THREADS=$(($(nproc)/2))
+  export PYTHONPATH="$PWD"/sage/pkgs/sage-setup
+
+  for _pkg in ${_pkgs[@]}; do
+    cd "$srcdir"/sage/pkgs/sagemath-$_pkg
+    python setup.py build
+  done
 }

 package() {
-    python -m installer dist/*.whl
+  for _pkg in ${_pkgs[@]}; do
+    cd "$srcdir"/sage/pkgs/sagemath-$_pkg
+    python setup.py install --root="$pkgdir" --optimize=1
+  done
+
+# fix symlinks to assets
+#  _pythonpath=`python -c "from sysconfig import get_path; print(get_path('platlib'))"`
+#  for _i in $(ls "$srcdir"/sage/src/sage/ext_data/notebook-ipython); do
+#    rm "$pkgdir"/usr/share/jupyter/kernels/sagemath/$_i
+#    ln -s $_pythonpath/sage/ext_data/notebook-ipython/$_i "$pkgdir"/usr/share/jupyter/kernels/sagemath/
+#  done
+
+# adjust threejs version
+#  rm "$pkgdir"$_pythonpath/sage/ext_data/threejs/threejs-version.txt
+#  ln -s /usr/share/threejs-sage/version "$pkgdir"$_pythonpath/sage/ext_data/threejs/threejs-version.txt
 }
-
-# prepare
-
-build
-
-package
@@ -1,44 +0,0 @@
-#!/usr/bin/env python
-# Copyright (c) Jupyter Development Team.
-# Distributed under the terms of the Modified BSD License.
-import os
-import shlex
-import sys
-
-# If we are in a JupyterHub, we pass on to `start-singleuser.py` instead so it does the right thing
-if "JUPYTERHUB_API_TOKEN" in os.environ:
-    print(
-        "WARNING: using start-singleuser.py instead of start-notebook.py to start a server associated with JupyterHub."
-    )
-    command = ["/usr/local/bin/start-singleuser.py"] + sys.argv[1:]
-    os.execvp(command[0], command)
-
-
-# Entrypoint is start.sh
-command = []
-
-# If we want to survive restarts, launch the command using `run-one-constantly`
-if os.environ.get("RESTARTABLE") == "yes":
-    command.append("run-one-constantly")
-
-# We always launch a jupyter subcommand from this script
-command.append("jupyter")
-
-# Launch the configured subcommand.
-# Note that this should be a single string, so we don't split it.
-# We default to `lab`.
-jupyter_command = os.environ.get("DOCKER_STACKS_JUPYTER_CMD", "lab")
-command.append(jupyter_command)
-
-# Append any optional NOTEBOOK_ARGS we were passed in.
-# This is supposed to be multiple args passed on to the notebook command,
-# so we split it correctly with shlex
-if "NOTEBOOK_ARGS" in os.environ:
-    command += shlex.split(os.environ["NOTEBOOK_ARGS"])
-
-# Pass through any other args we were passed on the command line
-command += sys.argv[1:]
-
-# Execute the command!
-print("Executing: " + " ".join(command))
-os.execvp(command[0], command)
@@ -1,70 +0,0 @@
-# Contributor: André Klitzing <aklitzing@gmail.com>
-# Maintainer: André Klitzing <aklitzing@gmail.com>
-pkgname=monero
-pkgver=0.18.4.5
-pkgrel=0
-_ver_randomx=10494476d6236b177733224123747201dec180bb
-_ver_supercop=633500ad8c8759995049ccd022107d1fa8a1bbc9
-pkgdesc="Secure, private, untraceable cryptocurrency"
-url="https://getmonero.org/"
-arch="all !riscv64" # build failure
-license="BSD-3-Clause"
-makedepends="
-	boost-dev
-	cmake
-	cppzmq
-	hidapi-dev
-	libsodium-dev
-	miniupnpc-dev
-	openssl-dev>3
-	rapidjson-dev
-	readline-dev
-	samurai
-	unbound-dev
-	zeromq-dev
-	"
-options="!check"
-source="$pkgname-$pkgver.tar.gz::https://github.com/monero-project/monero/archive/refs/tags/v$pkgver.tar.gz
-	$pkgname-randomx-$_ver_randomx.tar.gz::https://github.com/tevador/RandomX/archive/$_ver_randomx.tar.gz
-	$pkgname-supercop-$_ver_supercop.tar.gz::https://github.com/monero-project/supercop/archive/$_ver_supercop.tar.gz
-	easylogging.patch
-	gcc13.patch
-	system-miniupnpc.patch
-	version-string.patch
-	loongarch64.patch
-	miniupnpc.patch
-	"
-
-prepare() {
-	default_prepare
-
-	rm -fr external/randomx external/supercop
-	ln -s $srcdir/RandomX-$_ver_randomx external/randomx
-	ln -s $srcdir/supercop-$_ver_supercop external/supercop
-}
-
-build() {
-	cmake -B build -G Ninja \
-		-DCMAKE_BUILD_TYPE=None \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DSTACK_TRACE=OFF \
-		-DMANUAL_SUBMODULES=1 \
-		-DARCH=default
-	cmake --build build
-}
-
-package() {
-	DESTDIR="$pkgdir" cmake --install build
-}
-
-sha512sums="
-9899c53e79fad57fd66a77b2053fd2d9856b1834a041800826337110b9f8188300b67c78d5c93dbd01510f7bf6b9c682f19f154ceb9ecad6adf818474b517cfa  monero-0.18.4.5.tar.gz
-41ab097ec43b79844f4e9f2143ead381bcda228e6eae6fe082f078846ca2e3e50e2800f645355f879dc14ef7980c98a4019da9f9aaa2175b59c80e099d5be3fc  monero-randomx-10494476d6236b177733224123747201dec180bb.tar.gz
-06cca8d1def31aa11bf5aa42d861c4a027786f7cc494fa3ab53a2bc4bd9d1f55b2389020ba5fd1816ed277b6e4320ad8edbb3117dcf4981fc7fba655c4bbe648  monero-supercop-633500ad8c8759995049ccd022107d1fa8a1bbc9.tar.gz
-c149f1e6a6968115f95213d512116457b36665ff1159c5137dda45fa27712ce6f088b908663fb429b8e5f74e41d6cd57669db79d596564ddaca481dbdc63393e  easylogging.patch
-9d1ae2b057d49abb1fcd04744069bc3898f8822db2ecf259bc6f0f8b20c4871ba9947356c548e43d2fc20aa4aa03aaf02e0052d53056028d334638c0a360842a  gcc13.patch
-15aacc364c0877bce1113c65c40daf33287bc9f26d94e0d8841940eb9fa7a9abf3c25f6ab37a9f91cdb093668e2a345a59b0a6a0e3f06dbad1078530f216dc72  system-miniupnpc.patch
-411d041754bf801a4dcff6eb52d0d7fa29ad07ce673f956764b2d4b8c8252233b5f09f8833f8461be0f9b0c922748db71fecad04ae755c61ebe50113e2648485  version-string.patch
-f71bace84a4569cf6c7e094303bb98ba7472d8e8f35b5ece4d5d1e60b3c6a75fb212cbf88a3bc5a5b0ef28a645c7b1c32520f940fa935e42421885cfb0268f74  loongarch64.patch
-c7e143b31906e1b08f8c04374a8ec5285d83bb8f5a958e2bbd1c2d4fc78645e3a43f456eb321810998ff4c147a85d9617188eb68b3287e7279b2495805645939  miniupnpc.patch
-"
@@ -1,46 +0,0 @@
-FROM alpine:3.23 AS base
-
-FROM base AS builder
-RUN --mount=type=cache,target=/var/cache/apk apk update
-RUN --mount=type=cache,target=/var/cache/apk apk add \
-	abuild \
-  build-base \
-	boost-dev \
-	cmake \
-  cppzmq \
-  hidapi-dev \
-  libsodium-dev \
-  miniupnpc-dev \
-  openssl-dev \
-  rapidjson-dev \
-  readline-dev \
-  samurai \
-  unbound-dev \
-  zeromq-dev
-
-RUN adduser -D -G abuild luser
-USER luser
-WORKDIR /home/luser
-
-ADD --chown=luser:luser ./APKBUILD .
-ADD --chown=luser:luser ./easylogging.patch .
-ADD --chown=luser:luser ./gcc13.patch .
-ADD --chown=luser:luser ./system-miniupnpc.patch .
-ADD --chown=luser:luser ./version-string.patch .
-ADD --chown=luser:luser ./loongarch64.patch .
-ADD --chown=luser:luser ./miniupnpc.patch .
-RUN abuild-keygen -a -n
-USER root
-RUN cp /home/luser/.abuild/*.pub /etc/apk/keys/
-USER luser
-RUN abuild
-
-
-FROM base AS release
-RUN adduser -D -h /var/lib/monero monero
-RUN --mount=type=bind,from=builder,source=/home/luser/.abuild,target=/.abuild cp /.abuild/*.pub /etc/apk/keys
-RUN --mount=type=bind,from=builder,source=/home/luser/packages,target=/packages apk add /packages/*/*/*.apk
-USER monero
-WORKDIR /var/lib/monero
-ENTRYPOINT /usr/bin/monerod
-
@@ -1,11 +0,0 @@
--- a/external/easylogging++/easylogging++.h
-+++ b/external/easylogging++/easylogging++.h
-@@ -221,7 +221,7 @@
- #  define ELPP_INTERNAL_INFO(lvl, msg)
- #endif  // (defined(ELPP_DEBUG_INFO))
- #if (defined(ELPP_FEATURE_ALL)) || (defined(ELPP_FEATURE_CRASH_LOG))
-#  if (ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD && !ELPP_OS_NETBSD && !ELPP_OS_ANDROID && !ELPP_OS_EMSCRIPTEN)
-+#  if (__has_include(<execinfo.h>) && ELPP_COMPILER_GCC && !ELPP_MINGW && !ELPP_OS_OPENBSD && !ELPP_OS_NETBSD && !ELPP_OS_ANDROID && !ELPP_OS_EMSCRIPTEN)
- #    define ELPP_STACKTRACE 1
- #  else
- #    define ELPP_STACKTRACE 0
@@ -1,24 +0,0 @@
-diff --git a/contrib/epee/src/file_io_utils.cpp b/contrib/epee/src/file_io_utils.cpp
-index c0798a5..4549ead 100644
--- a/contrib/epee/src/file_io_utils.cpp
-+++ b/contrib/epee/src/file_io_utils.cpp
-@@ -26,6 +26,7 @@
- 
- #include "file_io_utils.h"
- 
-+#include <cstdint>
- #include <fstream>
- #include <boost/filesystem/path.hpp>
- #include <boost/filesystem/operations.hpp>
-diff --git a/src/common/combinator.cpp b/src/common/combinator.cpp
-index 72b1397..c98e3da 100644
--- a/src/common/combinator.cpp
-+++ b/src/common/combinator.cpp
-@@ -29,6 +29,7 @@
- //
- // Parts of this file are originally copyright (c) 2012-2013 The Cryptonote developers
- 
-+#include <cstdint>
- #include "combinator.h"
- 
- namespace tools {
@@ -1,34 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8fb03ba..3fbd9cf 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -335,6 +335,11 @@ set(RISCV   1)
- set(RISCV32 1)
- endif()
- 
-+if(ARCH_ID STREQUAL "loongarch64")
-+set(LOONGARCH 1)
-+set(LOONGARCH64 1)
-+endif()
-+
- if(WIN32 OR ARM OR PPC64LE OR PPC64 OR PPC)
-   set(OPT_FLAGS_RELEASE "-O2")
- else()
-@@ -748,7 +753,7 @@ else()
-     message(STATUS "AES support explicitly disabled")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNO_AES")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNO_AES")
-  elseif(NOT ARM AND NOT PPC64LE AND NOT PPC64 AND NOT PPC AND NOT S390X AND NOT RISCV)
-+  elseif(NOT ARM AND NOT PPC64LE AND NOT PPC64 AND NOT PPC AND NOT S390X AND NOT RISCV AND NOT LOONGARCH64)
-     message(STATUS "AES support enabled")
-     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
-     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
-@@ -762,6 +767,8 @@ else()
-     message(STATUS "AES support not available on ARMv6")
-   elseif(ARM7)
-     message(STATUS "AES support not available on ARMv7")
-+  elseif(LOONGARCH64)
-+    message(STATUS "AES support not available on LoongArch64")
-   elseif(ARM8)
-     CHECK_CXX_ACCEPTS_FLAG("-march=${ARCH}+crypto" ARCH_PLUS_CRYPTO)
-     if(ARCH_PLUS_CRYPTO)
@@ -1,22 +0,0 @@
-API changed in miniupnpc 2.2.8
-
--- a/src/p2p/net_node.inl
-+++ b/src/p2p/net_node.inl
-@@ -2989,7 +2989,7 @@
-     UPNPUrls urls;
-     IGDdatas igdData;
-     char lanAddress[64];
-    result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);
-+    result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, nullptr, 0);
-     freeUPNPDevlist(deviceList);
-     if (result > 0) {
-       if (result == 1) {
-@@ -3057,7 +3057,7 @@
-     UPNPUrls urls;
-     IGDdatas igdData;
-     char lanAddress[64];
-    result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress);
-+    result = UPNP_GetValidIGD(deviceList, &urls, &igdData, lanAddress, sizeof lanAddress, nullptr, 0);
-     freeUPNPDevlist(deviceList);
-     if (result > 0) {
-       if (result == 1) {
@@ -1,100 +0,0 @@
--- monero-0.18.4.1/CMakeLists.txt
-+++ monero-0.18.4.1.final/CMakeLists.txt
-@@ -676,6 +676,14 @@
- include_directories("${CMAKE_CURRENT_BINARY_DIR}/translations")
- add_subdirectory(external)
- 
-+# Final setup for miniupnpc
-+if(UPNP_STATIC OR IOS)
-+  add_definitions("-DUPNP_STATIC")
-+else()
-+  add_definitions("-DUPNP_DYNAMIC")
-+  include_directories(${UPNP_INCLUDE})
-+endif()
-+
- # Final setup for libunbound
- include_directories(${UNBOUND_INCLUDE_DIR})
- 
--- monero-0.18.4.1/external/CMakeLists.txt
-+++ monero-0.18.4.1.final/external/CMakeLists.txt
-@@ -34,25 +34,45 @@
- # We always compile if we are building statically to reduce static dependency issues...
- # ...except for FreeBSD, because FreeBSD is a special case that doesn't play well with
- # others.
-+if(NOT IOS)
-+    find_package(Miniupnpc QUIET)
-+endif()
- 
-find_package(Miniupnpc REQUIRED)
-
-message(STATUS "Using in-tree miniupnpc")
-set(UPNPC_NO_INSTALL TRUE CACHE BOOL "Disable miniupnp installation" FORCE)
-set(UPNPC_BUILD_SHARED OFF CACHE BOOL "Disable building shared library" FORCE)
-add_subdirectory(miniupnp/miniupnpc)
-set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
-set_property(TARGET libminiupnpc-static PROPERTY POSITION_INDEPENDENT_CODE ON)
-if(MSVC)
-  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
-elseif(NOT MSVC)
-  set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
-+# If we have the correct shared version and we're not building static, use it
-+if(STATIC OR IOS)
-+ set(USE_SHARED_MINIUPNPC false)
-+elseif(MINIUPNP_FOUND AND MINIUPNPC_VERSION_1_7_OR_HIGHER)
-+ set(USE_SHARED_MINIUPNPC true)
- endif()
- if(CMAKE_SYSTEM_NAME MATCHES "NetBSD")
- 	set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -D_NETBSD_SOURCE")
- endif()
- 
-set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+if(USE_SHARED_MINIUPNPC)
-+  message(STATUS "Using shared miniupnpc found at ${MINIUPNP_INCLUDE_DIR}")
-+
-+  set(UPNP_STATIC false PARENT_SCOPE)
-+  set(UPNP_INCLUDE ${MINIUPNP_INCLUDE_DIR} PARENT_SCOPE)
-+  set(UPNP_LIBRARIES ${MINIUPNP_LIBRARY} PARENT_SCOPE)
-+else()
-+  if(STATIC)
-+    message(STATUS "Using miniupnpc from local source tree for static build")
-+  else()
-+    message(STATUS "Using miniupnpc from local source tree (/external/miniupnp/miniupnpc)")
-+  endif()
-+  add_subdirectory(miniupnp/miniupnpc)
-+
-+  set_property(TARGET libminiupnpc-static PROPERTY FOLDER "external")
-+  if(MSVC)
-+    set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -wd4244 -wd4267")
-+  elseif(NOT MSVC)
-+    set_property(TARGET libminiupnpc-static APPEND_STRING PROPERTY COMPILE_FLAGS " -Wno-undef -Wno-unused-result -Wno-unused-value")
-+  endif()
-+
-+  set(UPNP_STATIC true PARENT_SCOPE)
-+  set(UPNP_LIBRARIES "libminiupnpc-static" PARENT_SCOPE)
-+endif()
-+
- 
- find_package(Unbound)
- 
--- monero-0.18.4.1/src/p2p/net_node.inl
-+++ monero-0.18.4.1.final/src/p2p/net_node.inl
-@@ -60,9 +60,16 @@
- #include "cryptonote_core/cryptonote_core.h"
- #include "net/parse.h"
- 
-#include <miniupnp/miniupnpc/miniupnpc.h>
-#include <miniupnp/miniupnpc/upnpcommands.h>
-#include <miniupnp/miniupnpc/upnperrors.h>
-+// We have to look for miniupnpc headers in different places, dependent on if its compiled or external
-+#ifdef UPNP_STATIC
-+  #include <miniupnp/miniupnpc/miniupnpc.h>
-+  #include <miniupnp/miniupnpc/upnpcommands.h>
-+  #include <miniupnp/miniupnpc/upnperrors.h>
-+#else
-+  #include "miniupnpc.h"
-+  #include "upnpcommands.h"
-+  #include "upnperrors.h"
-+#endif
- 
- #undef MONERO_DEFAULT_LOG_CATEGORY
- #define MONERO_DEFAULT_LOG_CATEGORY "net.p2p"
@@ -1,13 +0,0 @@
-diff --git a/cmake/Version.cmake b/cmake/Version.cmake
-index 3677e80..490de2c 100644
--- a/cmake/Version.cmake
-+++ b/cmake/Version.cmake
-@@ -32,7 +32,7 @@ function (write_static_version_header hash)
- endfunction ()
- 
- find_package(Git QUIET)
-if ("$Format:$" STREQUAL "")
-+if ("$Format:$" STREQUAL "" OR NOT EXISTS .git)
-   # We're in a tarball; use hard-coded variables.
-   set(VERSION_IS_RELEASE "true")
-   write_version("release")
@@ -1,8 +1,8 @@
 ARG NGINX_BRANCH=vanilla
-FROM alpine:3.24 AS base
+FROM alpine:3.22 AS base

 FROM base AS build_stage_1
-ARG NGINX_VERSION LIBRESSL_VERSION NJS_VERSION
+ARG NGINX_VERSION LIBRESSL_VERSION
 RUN --mount=type=cache,target=/var/cache/apk apk update
 RUN --mount=type=cache,target=/var/cache/apk apk add \
 	autoconf \
@@ -10,11 +10,9 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
 	bind-tools \
 	binutils \
 	build-base \
-	c-ares-dev \
 	ca-certificates \
 	cmake \
 	gcc \
-	g++ \
 	gd-dev \
 	geoip-dev \
 	git \
@@ -31,13 +29,12 @@ RUN --mount=type=cache,target=/var/cache/apk apk add \
 	pcre \
 	pcre-dev \
 	perl-dev \
-	quickjs-dev \
-	re2-dev \
 	su-exec \
 	tar \
 	tzdata \
 	zlib \
-	zlib-dev
+	zlib-dev \
+	mercurial
 RUN adduser -D luser
 USER luser
 WORKDIR /home/luser
@@ -50,14 +47,12 @@ RUN mkdir -p libressl/build
 RUN cmake -G Ninja -B libressl/build -S libressl \ 
 	-DCMAKE_BUILD_TYPE=Release \
 	-DLIBRESSL_APPS=OFF \
-	-DLIBRESSL_SKIP_INSTALL=OFF \
-	-DCMAKE_INSTALL_PREFIX=/home/luser/.local \
+	-DLIBRESSL_SKIP_INSTALL=ON \
 	-DENABLE_ASM=OFF \
 	-DENABLE_NC=OFF \
 	-DLIBRESSL_TESTS=OFF \
 	-DBUILD_SHARED_LIBS=OFF
 RUN cmake --build libressl/build
-RUN cmake --install libressl/build

 FROM build_stage_1 AS build_stage_2_vanilla
 ARG NGINX_VERSION
@@ -73,7 +68,7 @@ ADD --chown=luser:luser https://github.com/google/ngx_brotli.git /ngx_brotli

 USER root
 WORKDIR /
-ADD --chown=luser:luser git@github.com:nginx/njs.git#${NJS_VERSION} /njs
+RUN hg clone http://hg.nginx.org/njs /njs
 RUN chown luser:luser -R /njs
 USER luser
 WORKDIR /home/luser
@@ -87,22 +82,6 @@ WORKDIR /home/luser
 ADD --chown=luser:luser --chmod=755 ./build-rtmp.sh ./build-rtmp.sh
 RUN ./build-rtmp.sh

-FROM build AS build-otel
-ADD --chown=luser:luser https://github.com/nginx/nginx-otel.git#v0.1.2 /nginx-otel
-USER luser
-RUN cmake -G Ninja -B /home/luser/otel-build -S /nginx-otel \
-       -DNGX_OTEL_NGINX_BUILD_DIR=/nginx/objs \
-       -DCMAKE_BUILD_TYPE=Release \
-			 -DOPENSSL_ROOT_DIR=/home/luser/.local \
-			 -DNGX_OTEL_SDK=6f65c3eded2bb4656c8d675cad43bbe694c531c7 \
-			 -DNGX_OTEL_GRPC=c876f4da50f7da2f331888b88b2a7243514139fe \
-			 -DWITH_OTLP_GRPC=ON \
-			 -DWITH_OTLP_HTTP=ON \
-			 -DWITH_BENCHMARK=OFF \
-			 -DWITH_FUNC_TESTS=OFF \
-       && cmake --build /home/luser/otel-build
-
-
 FROM base AS release
 ARG VERSION
 ENV NGINX_VERSION=${VERSION}
@@ -120,7 +99,6 @@ RUN --mount=type=cache,target=/var/cache/apk \
 	 (cd nginx && sh /install.sh)
 RUN --mount=type=cache,target=/var/cache/apk apk del .install_deps
 COPY --from=build-rtmp --chown=root:root /nginx/objs/ngx_rtmp_module.so /usr/lib/nginx/modules/
-COPY --from=build-otel --chown=root:root /home/luser/otel-build/ngx_otel_module.so /usr/lib/nginx/modules/
 COPY --from=build /home/luser/libressl/openssl.cnf /etc/ssl/openssl.cnf
 COPY conf/nginx.conf /etc/nginx/nginx.conf
 COPY conf/dhparam /etc/nginx/dhparam
@@ -18,7 +18,6 @@ CONFIG='
 		--http-scgi-temp-path=/var/cache/nginx/scgi_temp
 		--user=nginx
 		--group=nginx
-		--with-pcre
 		--with-http_ssl_module
 		--with-http_realip_module
 		--with-http_addition_module
@@ -17,7 +17,7 @@ strip -s /usr/lib/nginx/modules/*.so

 apk add --no-cache --virtual .gettext gettext
 mv /usr/bin/envsubst /tmp/
-runDeps="libintl libxml2 musl zlib tzdata ca-certificates pcre brotli-libs libxslt geoip libstdc++ c-ares libprotobuf re2"
+runDeps="libintl libxml2 musl zlib tzdata ca-certificates pcre brotli-libs libxslt geoip"
 apk add --no-cache $runDeps
 apk del .gettext
 mv /tmp/envsubst /usr/local/bin/
@@ -1,65 +0,0 @@
-ARG BUN_VERSION
-FROM oven/bun:${BUN_VERSION}-slim AS build
-	
-ARG OPENCODE_VERSION
-# RUN --mount=type=cache,target=/var/cache/apk apk update
-# RUN --mount=type=cache,target=/var/cache/apk apk add python3 make g++ npm zip git
-RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
-    --mount=type=cache,target=/var/lib/apt,sharing=locked \
-    apt update &&\
-    apt install -y python3 make g++ npm zip git
-#RUN adduser -D -h /home/builder -u 1126 builder
-RUN useradd -m -u 1126 builder
-USER builder
-WORKDIR /home/builder
-ADD --chown=builder:builder --keep-git-dir=true git@github.com:anomalyco/opencode.git#v${OPENCODE_VERSION} opencode
-WORKDIR /home/builder/opencode
-
-RUN --mount=type=cache,target=/home/builder/.bun/install/cache,uid=1126 bun install
-ADD --chown=builder:builder ./build.ts ./packages/opencode/script/build.ts
-RUN --mount=type=cache,target=/home/builder/.bun/install/cache,uid=1126 ./packages/opencode/script/build.ts
-
-
-
-
-FROM archlinux:latest AS base-release
-ARG OPENCODE_VERSION
-COPY mirrorlist /etc/pacman.d/mirrolist
-RUN pacman-key --init
-#RUN pacman-key --refresh-keys
-
-ADD https://gitea.woggioni.net/api/packages/woggioni/arch/repository.key ./repository.key
-
-RUN pacman-key --add repository.key
-RUN pacman-key --lsign-key 0D28BF66FDB45D18D8EBEE5D4C91DADCD00B3F77
-
-RUN --mount=type=bind,source=pacman-gitea-repository.conf,target=pacman-gitea-repository.conf cat pacman-gitea-repository.conf  >> /etc/pacman.conf
-RUN echo 'PATH	DEFAULT=${HOME}/.local/bin:${HOME}/.cargo/bin:/usr/local/bin:/bin' >> /etc/security/pam_env.conf
-RUN rm repository.key
-RUN --mount=type=cache,target=/var/cache/pacman pacman -Syu --noconfirm
-RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed \
-    xdg-utils rustup rust-analyzer jdtls python-pipx ripgrep git rustup gradle curl sccache openssh \
-    bash-language-server marksman python-lsp-server vscode-css-languageserver x86_64-unknown-linux-musl-zlib x86_64-unknown-linux-musl-gcc \
-    vscode-html-languageserver vscode-json-languageserver yaml-language-server base-devel docker docker-buildx docker-compose less websocat
-RUN --mount=type=cache,target=/var/cache/pacman pacman -S --noconfirm --needed jdk25-graalvm-bin
-RUN useradd -m -d /var/lib/opencode opencode
-RUN mkdir /workspace
-RUN chown opencode:opencode /workspace
-USER opencode
-RUN pipx install pyright
-RUN pipx install pip-tools
-USER root
-ADD --chown=opencode:opencode ./opencode.json /etc/opencode/opencode.json
-RUN mkdir -p /usr/lib/opencode/addons
-ADD --chmod=644 https://repo1.maven.org/maven2/org/projectlombok/lombok/1.18.46/lombok-1.18.46.jar /usr/lib/opencode/addons/lombok.jar
-ENV OPENCODE_CONFIG=/etc/opencode/opencode.json
-USER opencode
-WORKDIR /workspace
-ENTRYPOINT ["opencode"]
-VOLUME ["/var/lib/opencode", "/workspace"]
-
-
-FROM base-release AS release
-COPY --from=build --chown=root:root /home/builder/opencode/packages/opencode/dist/opencode-linux-x64/bin/opencode /usr/bin/opencode
-FROM base-release AS release-bin
-ADD --unpack https://github.com/anomalyco/opencode/releases/download/v${OPENCODE_VERSION}/opencode-linux-x64.tar.gz /usr/bin
@@ -1,220 +0,0 @@
-#!/usr/bin/env bun
-
-import { $ } from "bun"
-import path from "path"
-import { fileURLToPath } from "url"
-import { createSolidTransformPlugin } from "@opentui/solid/bun-plugin"
-
-const __filename = fileURLToPath(import.meta.url)
-const __dirname = path.dirname(__filename)
-const dir = path.resolve(__dirname, "..")
-
-process.chdir(dir)
-
-const generated = await import("./generate.ts")
-
-import { Script } from "@opencode-ai/script"
-import pkg from "../package.json"
-
-const singleFlag = process.argv.includes("--single")
-const baselineFlag = process.argv.includes("--baseline")
-const skipInstall = process.argv.includes("--skip-install")
-const sourcemapsFlag = process.argv.includes("--sourcemaps")
-const plugin = createSolidTransformPlugin()
-const skipEmbedWebUi = process.argv.includes("--skip-embed-web-ui")
-
-const createEmbeddedWebUIBundle = async () => {
-  console.log(`Building Web UI to embed in the binary`)
-  const appDir = path.join(import.meta.dirname, "../../app")
-  const dist = path.join(appDir, "dist")
-  await $`OPENCODE_CHANNEL=${Script.channel} bun run --cwd ${appDir} build`
-  const files = (await Array.fromAsync(new Bun.Glob("**/*").scan({ cwd: dist })))
-    .map((file) => file.replaceAll("\\", "/"))
-    .filter((file) => !file.endsWith(".map"))
-    .sort()
-  const imports = files.map((file, i) => {
-    const spec = path.relative(dir, path.join(dist, file)).replaceAll("\\", "/")
-    return `import file_${i} from ${JSON.stringify(spec.startsWith(".") ? spec : `./${spec}`)} with { type: "file" };`
-  })
-  const entries = files.map((file, i) => `  ${JSON.stringify(file)}: file_${i},`)
-  return [
-    `// Import all files as file_$i with type: "file"`,
-    ...imports,
-    `// Export with original mappings`,
-    `export default {`,
-    ...entries,
-    `}`,
-  ].join("\n")
-}
-
-const embeddedFileMap = skipEmbedWebUi ? null : await createEmbeddedWebUIBundle()
-const treeSitterWorker = await Bun.file(fileURLToPath(import.meta.resolve("@opentui/core/parser.worker"))).text()
-
-const allTargets: {
-  os: string
-  arch: "arm64" | "x64"
-  abi?: "musl"
-  avx2?: false
-}[] = [
-  {
-    os: "linux",
-    arch: "arm64",
-  },
-  {
-    os: "linux",
-    arch: "x64",
-  },
-  {
-    os: "linux",
-    arch: "x64",
-    avx2: false,
-  },
-  {
-    os: "linux",
-    arch: "arm64",
-    abi: "musl",
-  },
-  {
-    os: "linux",
-    arch: "x64",
-    abi: "musl",
-  },
-  {
-    os: "linux",
-    arch: "x64",
-    abi: "musl",
-    avx2: false,
-  }
-]
-
-const targets = singleFlag
-  ? allTargets.filter((item) => {
-      if (item.os !== process.platform || item.arch !== process.arch) {
-        return false
-      }
-
-      // When building for the current platform, prefer a single native binary by default.
-      // Baseline binaries require additional Bun artifacts and can be flaky to download.
-      if (item.avx2 === false) {
-        return baselineFlag
-      }
-
-      // also skip abi-specific builds for the same reason
-      if (item.abi !== undefined) {
-        return false
-      }
-
-      return true
-    })
-  : allTargets
-
-await $`rm -rf dist`
-
-const binaries: Record<string, string> = {}
-if (!skipInstall) {
-  await $`bun install --os="*" --cpu="*" @opentui/core@${pkg.dependencies["@opentui/core"]}`
-  await $`bun install --os="*" --cpu="*" @parcel/watcher@${pkg.dependencies["@parcel/watcher"]}`
-  await $`bun install --os="*" --cpu="*" @ff-labs/fff-bun@${pkg.dependencies["@ff-labs/fff-bun"]}`
-}
-for (const item of targets) {
-  const name = [
-    pkg.name,
-    // changing to win32 flags npm for some reason
-    item.os === "win32" ? "windows" : item.os,
-    item.arch,
-    item.avx2 === false ? "baseline" : undefined,
-    item.abi === undefined ? undefined : item.abi,
-  ]
-    .filter(Boolean)
-    .join("-")
-  console.log(`building ${name}`)
-  await $`mkdir -p dist/${name}/bin`
-
-  const workerPath = "./src/cli/tui/worker.ts"
-  const treeSitterWorkerPath = "opentui-tree-sitter-worker.js"
-  const bunfsRoot = item.os === "win32" ? "B:/~BUN/root/" : "/$bunfs/root/"
-
-  await Bun.build({
-    conditions: ["bun", "node"],
-    tsconfig: "./tsconfig.json",
-    plugins: [plugin],
-    external: ["node-gyp"],
-    format: "esm",
-    minify: true,
-    bytecode: true,
-    sourcemap: sourcemapsFlag ? "linked" : "none",
-    splitting: true,
-    compile: {
-      autoloadBunfig: false,
-      autoloadDotenv: false,
-      autoloadTsconfig: true,
-      autoloadPackageJson: true,
-      target: name.replace(pkg.name, "bun") as any,
-      outfile: `dist/${name}/bin/opencode`,
-      execArgv: [`--user-agent=opencode/${Script.version}`, "--use-system-ca", "--"],
-      windows: {},
-    },
-    files: {
-      [treeSitterWorkerPath]: treeSitterWorker,
-      ...(embeddedFileMap ? { "opencode-web-ui.gen.ts": embeddedFileMap } : {}),
-    },
-    entrypoints: [
-      "./src/index.ts",
-      workerPath,
-      treeSitterWorkerPath,
-      ...(embeddedFileMap ? ["opencode-web-ui.gen.ts"] : []),
-    ],
-    define: {
-      FFF_LIBC: JSON.stringify(item.abi === "musl" ? "musl" : "gnu"),
-      OPENCODE_VERSION: `'${Script.version}'`,
-      OPENCODE_MODELS_DEV: generated.modelsData,
-      OTUI_TREE_SITTER_WORKER_PATH: bunfsRoot + treeSitterWorkerPath,
-      OPENCODE_WORKER_PATH: workerPath,
-      OPENCODE_CHANNEL: `'${Script.channel}'`,
-      OPENCODE_LIBC: item.os === "linux" ? `'${item.abi ?? "glibc"}'` : "",
-      ...(item.os === "linux" ? { "process.env.OPENTUI_LIBC": JSON.stringify(item.abi ?? "glibc") } : {}),
-    },
-  })
-
-  // Smoke test: only run if binary is for current platform
-  if (item.os === process.platform && item.arch === process.arch && !item.abi) {
-    const binaryPath = `dist/${name}/bin/opencode`
-    console.log(`Running smoke test: ${binaryPath} --version`)
-    try {
-      const versionOutput = await $`${binaryPath} --version`.text()
-      console.log(`Smoke test passed: ${versionOutput.trim()}`)
-    } catch (e) {
-      console.error(`Smoke test failed for ${name}:`, e)
-      process.exit(1)
-    }
-  }
-
-  await $`rm -rf ./dist/${name}/bin/tui`
-  await Bun.file(`dist/${name}/package.json`).write(
-    JSON.stringify(
-      {
-        name,
-        version: Script.version,
-        preferUnplugged: true,
-        os: [item.os],
-        cpu: [item.arch],
-        ...(item.abi ? { libc: [item.abi] } : {}),
-      },
-      null,
-      2,
-    ),
-  )
-  binaries[name] = Script.version
-}
-
-if (Script.release) {
-  for (const key of Object.keys(binaries)) {
-    if (key.includes("linux")) {
-      await $`tar -czf ../../${key}.tar.gz *`.cwd(`dist/${key}/bin`)
-    } else {
-      await $`zip -r ../../${key}.zip *`.cwd(`dist/${key}/bin`)
-    }
-  }
-}
-
-export { binaries }
@@ -1,15 +0,0 @@
-################################################################################
-################# Arch Linux mirrorlist generated by Reflector #################
-################################################################################
-
-# With:       reflector @/etc/xdg/reflector/reflector.conf
-# When:       2024-07-09 04:16:31 UTC
-# From:       https://archlinux.org/mirrors/status/json/
-# Retrieved:  2024-07-09 04:16:31 UTC
-# Last Check: 2024-07-09 03:46:09 UTC
-
-Server = https://archlinux.thaller.ws/$repo/os/$arch
-Server = https://mirror.ubrco.de/archlinux/$repo/os/$arch
-Server = https://mirror.qctronics.com/archlinux/$repo/os/$arch
-Server = https://mirrors.neusoft.edu.cn/archlinux/$repo/os/$arch
-Server = https://arch.phinau.de/$repo/os/$arch
@@ -1,33 +0,0 @@
-{
-  "$schema": "https://opencode.ai/config.json",
-  "lsp": {
-    "java": {
-      "command": [
-        "jdtls"
-      ],
-      "extensions": [
-        ".java"
-      ],
-      "env": {
-        "JAVA_TOOL_OPTIONS": "-javaagent:/usr/lib/opencode/addons/lombok.jar"
-      }
-    },
-    "python": {
-      "command": [
-        "pyright"
-      ],
-      "extensions": [
-        ".py",
-        "pyi"
-      ]
-    },
-    "rust": {
-      "command": [
-        "rust-analyzer"
-      ],
-      "extensions": [
-        ".rs"
-      ]
-    }
-  }
-}
@@ -1,4 +0,0 @@
-
-[woggioni.gitea.woggioni.net]
-SigLevel = Required
-Server = https://gitea.woggioni.net/api/packages/woggioni/arch/default/x86_64
@@ -1,84 +0,0 @@
-# syntax=docker/dockerfile:1
-
-ARG ALPINE_VERSION=3.24
-ARG OTELCOL_VERSION=0.154.0
-
-FROM alpine:${ALPINE_VERSION} AS base
-FROM base AS downloader
-ARG OTELCOL_VERSION
-WORKDIR /downloads
-
-RUN --mount=type=cache,target=/var/cache/apk \
-    apk add curl tar ca-certificates
-
-RUN ARCH=$(uname -m) && \
-    case "$ARCH" in \
-        x86_64) TARGETARCH=amd64 ;; \
-        aarch64) TARGETARCH=arm64 ;; \
-        *) echo "Unsupported architecture: $ARCH"; exit 1 ;; \
-    esac && \
-    curl -fLo otelcol.tar.gz \
-    "https://github.com/open-telemetry/opentelemetry-collector-releases/releases/download/v${OTELCOL_VERSION}/otelcol-contrib_${OTELCOL_VERSION}_linux_${TARGETARCH}.tar.gz" && \
-    tar xzf otelcol.tar.gz && \
-    chmod +x otelcol-contrib
-
-FROM base
-
-# Install Grafana stack and supervisord from Alpine repositories.
-RUN --mount=type=cache,target=/var/cache/apk \
-    apk add \
-    ca-certificates \
-    supervisor \
-    grafana \
-    mimir \
-    loki \
-    tempo
-
-# Copy the OTel Collector binary from the downloader stage.
-COPY --from=downloader /downloads/otelcol-contrib /usr/local/bin/otelcol-contrib
-
-# Create data, Grafana, and supervisor directories.
-RUN mkdir -p /data/grafana && \
-    mkdir -p /data/grafana/logs && \
-    mkdir -p /data/grafana/plugins && \
-    mkdir -p /data/mimir && \
-    mkdir -p /data/loki && \
-    mkdir -p /data/tempo && \
-    mkdir -p /etc/grafana/provisioning/datasources && \
-    mkdir -p /etc/grafana/provisioning/dashboards && \
-    mkdir -p /etc/grafana/provisioning/plugins && \
-    mkdir -p /etc/grafana/provisioning/alerting && \
-    mkdir -p /var/log/supervisor && \
-    mkdir -p /var/run
-
-# Copy configuration files.
-COPY config/grafana.ini /etc/grafana.ini
-COPY config/grafana-datasources.yaml /etc/grafana/provisioning/datasources/datasources.yaml
-COPY config/grafana-dashboards.yaml /etc/grafana/provisioning/dashboards/grafana-dashboards.yaml
-COPY config/grafana-dashboard-jvm-metrics.json /usr/share/grafana/grafana-dashboard-jvm-metrics.json
-COPY config/grafana-dashboard-red-metrics-classic.json /usr/share/grafana/grafana-dashboard-red-metrics-classic.json
-COPY config/grafana-dashboard-red-metrics-native.json /usr/share/grafana/grafana-dashboard-red-metrics-native.json
-COPY config/opentelemetry-collector-hostmetrics-node-exporter.json /usr/share/grafana/opentelemetry-collector-hostmetrics-node-exporter.json
-
-RUN mkdir -p /var/lib/grafana/plugins
-RUN grafana cli --config /etc/grafana.ini --homepath /usr/share/grafana --pluginsDir /var/lib/grafana/plugins plugins install grafana-exploretraces-app
-RUN grafana cli --config /etc/grafana.ini --homepath /usr/share/grafana --pluginsDir /var/lib/grafana/plugins plugins install grafana-lokiexplore-app
-RUN grafana cli --config /etc/grafana.ini --homepath /usr/share/grafana --pluginsDir /var/lib/grafana/plugins plugins install grafana-metricsdrilldown-app
-RUN grafana cli --config /etc/grafana.ini --homepath /usr/share/grafana --pluginsDir /var/lib/grafana/plugins plugins install grafana-pyroscope-app
-
-COPY config/mimir.yaml /etc/mimir/mimir.yaml
-COPY config/loki.yaml /etc/loki/loki.yaml
-COPY config/tempo.yaml /etc/tempo/tempo.yaml
-COPY config/otelcol.yaml /etc/otelcol/otelcol.yaml
-COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-
-# Grafana anonymous admin access, provisioning path, and disable plugin pre-install.
-VOLUME ["/data"]
-
-EXPOSE 3000 4318
-
-HEALTHCHECK --interval=30s --timeout=5s --retries=3 \
-    CMD wget -qO- http://127.0.0.1:3000/api/health >/dev/null 2>&1 && \
-        wget -qO- http://127.0.0.1:13133/ready >/dev/null 2>&1
-
-CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
@@ -1,108 +0,0 @@
-# OTel LGTM (Alpine + supervisord)
-
-A single-container observability backend running on Alpine Linux with supervisord.
-
-Components:
-
- **Grafana** — visualization UI
- **Mimir** — metrics storage
- **Loki** — log storage
- **Tempo** — trace storage
- **OpenTelemetry Collector (contrib)** — OTLP receiver and router
-
-## Ports
-
-| Port | Service | Description |
-|------|---------|-------------|
-| 3000 | Grafana | Web UI |
-| 4318 | OTel Collector | OTLP/HTTP endpoint |
-
-Only these two ports are exposed. All other services communicate internally on `127.0.0.1`.
-
-## Build
-
-```bash
-docker build -t otel-lgtm .
-```
-
-> The Dockerfile uses BuildKit cache mounts for `apk`. Make sure BuildKit is enabled (default in recent Docker Desktop / `docker buildx`).
-
-### Build args
-
-| Build arg | Default | Description |
-|-----------|---------|-------------|
-| `ALPINE_VERSION` | `3.24` | Alpine Linux base image version |
-| `OTELCOL_VERSION` | `0.154.0` | OpenTelemetry Collector Contrib version |
-
-Grafana, Mimir, Loki, and Tempo versions are determined by the chosen Alpine repository.
-
-Example:
-
-```bash
-docker build --build-arg OTELCOL_VERSION=0.155.0 -t otel-lgtm .
-```
-
-### Multi-architecture
-
-The Dockerfile detects the build architecture at build time, so it works on both `amd64` and `arm64`. To build a true multi-arch image in one command, use Docker BuildKit / `docker buildx`:
-
-```bash
-docker buildx build --platform linux/amd64,linux/arm64 -t otel-lgtm .
-```
-
-## Run
-
-```bash
-docker run -p 3000:3000 -p 4318:4318 -v lgtm-data:/data otel-lgtm
-```
-
-Grafana is available at http://localhost:3000 with anonymous admin access enabled.
-
-Send telemetry to the collector at `http://localhost:4318` (OTLP/HTTP).
-
-## Data persistence
-
-All persistent data is written under `/data`:
-
-| Path | Service |
-|------|---------|
-| `/data/grafana` | Grafana data, logs, and plugins |
-| `/data/mimir` | Mimir metrics storage |
-| `/data/loki` | Loki log storage |
-| `/data/tempo` | Tempo trace storage |
-
-Mount a volume there to persist data across container restarts.
-
-## Architecture
-
-```
-Application ──OTLP/HTTP──> OTel Collector :4318
-    │
-    ├─ metrics ──OTLP/HTTP──> Mimir :9009
-    ├─ logs ─────OTLP/HTTP──> Loki :3100
-    └─ traces ───OTLP/HTTP──> Tempo :3200
-
-Grafana :3000 queries Mimir, Loki, and Tempo.
-```
-
-## Read-only root filesystem
-
-The image can be run with an immutable root filesystem (`--read-only`). A few runtime-only directories must be mounted as writable `tmpfs`:
-
-```bash
-docker run --read-only \
-  -p 3000:3000 -p 4318:4318 \
-  -v lgtm-data:/data \
-  --tmpfs /tmp:rw,noexec,nosuid,size=100m \
-  --tmpfs /run:rw,noexec,nosuid,size=10m \
-  --tmpfs /var/log/supervisor:rw,noexec,nosuid,size=50m \
-  otel-lgtm
-```
-
-Persistent data continues to live on the `/data` volume, while temporary/runtime state stays in memory.
-
-## Notes
-
- This image is intended for development, demo, and testing environments.
- Grafana authentication is disabled (`anonymous` admin).
- Grafana’s default async plugin pre-installation is disabled to avoid relying on internet access at startup.
@@ -1,928 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "datasource",
-          "uid": "grafana"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "Dashboard for JVM metrics with OpenTelemetry instrumentation",
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "gnetId": 18812,
-  "graphTooltip": 0,
-  "links": [
-    {
-      "asDropdown": false,
-      "icon": "info",
-      "includeVars": false,
-      "keepTime": false,
-      "tags": [],
-      "targetBlank": false,
-      "title": "Semantic Conventions: 1.20.0 - 1.22.0",
-      "tooltip": "multiple versions of the semantic conventions are supported using 'or' and regex queries",
-      "type": "link",
-      "url": "https://github.com/open-telemetry/semantic-conventions/blob/main/schemas/1.20.0"
-    }
-  ],
-  "liveNow": false,
-  "panels": [
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "HTTP server request rate",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 25,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "reqps"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 4,
-        "x": 0,
-        "y": 0
-      },
-      "id": 51,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "sum by (instance) (rate({__name__=~\"http_server_request_duration_seconds_count|http_server_request_duration_count|http_server_duration_seconds_count|http_server_duration_count|http_server_duration_milliseconds_count|http_server_requests_milliseconds_count|http_server_requests_count|http_server_requests_seconds_count\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))",
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "HTTP server error ratio - ratio of requests that return 5xx",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 25,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 5,
-        "x": 4,
-        "y": 0
-      },
-      "id": 50,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "(sum by (instance)(rate({__name__=~\"http_server_request_duration_seconds_count|http_server_request_duration_count\", job=~\"$job\", instance=~\"$instance\", http_response_status_code=~\"5.*\"}[$__rate_interval]))) / on (instance) (sum by (instance)(rate({__name__=~\"http_server_request_duration_seconds_count|http_server_request_duration_count\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])))\nor\n(sum by (instance)(rate({__name__=~\"http_server_duration_milliseconds_count|http_server_duration_seconds_count|http_server_duration_count\", job=~\"$job\", instance=~\"$instance\", http_status_code=~\"5.*\"}[$__rate_interval]))) / on (instance) (sum by (instance)(rate({__name__=~\"http_server_duration_milliseconds_count|http_server_duration_seconds_count|http_server_duration_count\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])))\nor\n(sum by (instance)(rate({__name__=~\"http_server_requests_milliseconds_count|http_server_requests_count|http_server_requests_seconds_count\", job=~\"$job\", instance=~\"$instance\", outcome=\"SERVER_ERROR\"}[$__rate_interval]))) / on (instance) (sum by (instance)(rate({__name__=~\"http_server_requests_milliseconds_count|http_server_requests_count|http_server_requests_seconds_count\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])))\n",
-          "instant": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Error %",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "95th percentile of HTTP server request duration in seconds",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 25,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 5,
-        "x": 9,
-        "y": 0
-      },
-      "id": 52,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "(histogram_quantile(0.95, sum by(le, instance) (rate({__name__=~\"http_server_request_duration_seconds_bucket|http_server_request_duration_bucket|http_server_duration_seconds_bucket|http_server_duration_bucket|http_server_requests_seconds_bucket\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))))\nor\n(histogram_quantile(0.95, sum by(le, instance) (rate({__name__=~\"http_server_duration_milliseconds_bucket|http_server_requests_milliseconds_bucket|http_server_requests_bucket\", job=~\"$job\", instance=~\"$instance\"}[$__rate_interval]))) / 1000)\n",
-          "instant": false,
-          "legendFormat": "{{instance}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Duration (95%)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "CPU utilization for the whole system",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 25,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 7,
-        "x": 0,
-        "y": 8
-      },
-      "id": 38,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "desc"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "{__name__=~\"jvm_cpu_recent_utilization|jvm_cpu_recent_utilization_ratio|process_runtime_jvm_system_cpu_utilization|process_runtime_jvm_system_cpu_utilization_ratio|system_cpu_usage\", job=~\"$job\", instance=~\"$instance\"}",
-          "legendFormat": "{{instance}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "CPU utilization",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "Used heap memory / heap memory limit ",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 25,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 7,
-        "x": 7,
-        "y": 8
-      },
-      "id": 30,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "(sum by (instance) ({__name__=~\"jvm_memory_used|jvm_memory_used_bytes\",job=~\"$job\",jvm_memory_type=\"heap\", instance=~\"$instance\"}) / on(instance) sum by (instance) ({__name__=~\"jvm_memory_limit|jvm_memory_limit_bytes\",job=~\"$job\",jvm_memory_type=\"heap\", instance=~\"$instance\"}))\nor\n(sum by (instance) ({__name__=~\"process_runtime_jvm_memory_usage|process_runtime_jvm_memory_usage_bytes\",job=~\"$job\",type=\"heap\", instance=~\"$instance\"}) / on(instance) sum by (instance) ({__name__=~\"process_runtime_jvm_memory_limit|process_runtime_jvm_memory_limit_bytes\",job=~\"$job\",type=\"heap\", instance=~\"$instance\"}))\nor\n(sum by (instance) ({__name__=~\"jvm_memory_used|jvm_memory_used_bytes\",job=~\"$job\",area=\"heap\", instance=~\"$instance\"}) / on(instance) sum by (instance) ({__name__=~\"jvm_memory_max|jvm_memory_max_bytes\",job=~\"$job\",area=\"heap\", instance=~\"$instance\"}))",
-          "legendFormat": "{{instance}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Heap Memory utilization",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "Percentage of time spend for garbage collection pauses",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 25,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              }
-            ]
-          },
-          "unit": "percentunit"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 4,
-        "x": 0,
-        "y": 15
-      },
-      "id": 46,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "(sum by(instance) (rate({__name__=~\"jvm_gc_duration_sum|jvm_gc_duration_seconds_sum|process_runtime_jvm_gc_duration_sum|process_runtime_jvm_gc_duration_seconds_sum|jvm_gc_pause_sum|jvm_gc_pause_seconds_sum\",job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])))\nor\n(sum by(instance) (rate(jvm_gc_pause_milliseconds_sum{job=~\"$job\", instance=~\"$instance\"}[$__rate_interval])) / 1000)",
-          "hide": false,
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Garbage Collection",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "Number of currently loaded classes",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 25,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 5,
-        "x": 4,
-        "y": 15
-      },
-      "id": 33,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "multi",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "{__name__=~\"jvm_class_count|process_runtime_jvm_classes_current_loaded|jvm_classes_loaded\",job=~\"$job\", instance=~\"$instance\"}",
-          "legendFormat": "{{instance}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Classes",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${datasource}"
-      },
-      "description": "Number of currently executing (also called \"live\") threads",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 25,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "none"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 7,
-        "w": 5,
-        "x": 9,
-        "y": 15
-      },
-      "id": 42,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${datasource}"
-          },
-          "editorMode": "code",
-          "expr": "sum({__name__=~\"jvm_thread_count|process_runtime_jvm_threads_count|jvm_threads_live\",job=~\"$job\", instance=~\"$instance\"}) by (instance)",
-          "legendFormat": "{{instance}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Threads",
-      "type": "timeseries"
-    }
-  ],
-  "refresh": "",
-  "schemaVersion": 38,
-  "tags": ["JVM", "open-telemetry", "Java", "otel", "opentelemetry", "otlp"],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "selected": false,
-          "text": "Prometheus",
-          "value": "prometheus"
-        },
-        "description": "Choose a Prometheus data source",
-        "hide": 0,
-        "includeAll": false,
-        "label": "Data source",
-        "multi": false,
-        "name": "datasource",
-        "options": [],
-        "query": "prometheus",
-        "queryValue": "",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "type": "datasource"
-      },
-      {
-        "allValue": ".+",
-        "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${datasource}"
-        },
-        "definition": "label_values({__name__=~\"jvm_class_count|process_runtime_jvm_classes_current_loaded|jvm_classes_loaded\"},job)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Job",
-        "multi": true,
-        "name": "job",
-        "options": [],
-        "query": {
-          "query": "label_values({__name__=~\"jvm_class_count|process_runtime_jvm_classes_current_loaded|jvm_classes_loaded\"},job)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 2,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 1,
-        "tagValuesQuery": "",
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": ".+",
-        "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${datasource}"
-        },
-        "definition": "label_values({__name__=~\"(jvm_class_count|process_runtime_jvm_classes_current_loaded|jvm_classes_loaded)\", job=~\"$job\"},instance)",
-        "description": "The instance of the application, e.g. pod1",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Instance",
-        "multi": true,
-        "name": "instance",
-        "options": [],
-        "query": {
-          "query": "label_values({__name__=~\"(jvm_class_count|process_runtime_jvm_classes_current_loaded|jvm_classes_loaded)\", job=~\"$job\"},instance)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 2,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 1,
-        "tagValuesQuery": "",
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      }
-    ]
-  },
-  "time": {
-    "from": "now-1h",
-    "to": "now"
-  },
-  "timepicker": {
-    "refresh_intervals": [
-      "5s",
-      "10s",
-      "30s",
-      "1m",
-      "5m",
-      "15m",
-      "30m",
-      "1h",
-      "2h",
-      "1d"
-    ],
-    "time_options": ["5m", "15m", "1h", "6h", "12h", "24h", "2d", "7d", "30d"]
-  },
-  "timezone": "",
-  "title": "JVM Overview (OpenTelemetry)",
-  "uid": "b91844d7-121e-4d0a-93b8-a9c1a05703b3",
-  "version": 1,
-  "weekStart": ""
-}
@@ -1,584 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "request rate, error rate, duration",
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "id": 4,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "datasource": {
-        "type": "datasource",
-        "uid": "grafana"
-      },
-      "description": "",
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 6,
-      "options": {
-        "code": {
-          "language": "plaintext",
-          "showLineNumbers": false,
-          "showMiniMap": false
-        },
-        "content": "# RED Metrics: (r)equest rate, (e)rror rate, (d)uration\n\nThis dashboard uses explicit bucket histograms and the stable [OpenTelemetry metrics semantic conventions](https://opentelemetry.io/docs/specs/semconv/general/metrics/).\nTo enable this for the [OpenTelemetry Java instrumentation agent](https://github.com/open-telemetry/opentelemetry-java-instrumentation/), set the following environment variables:\n\n```\nexport OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION=explicit_bucket_histogram\n```",
-        "mode": "markdown"
-      },
-      "pluginVersion": "10.3.3",
-      "type": "text"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prometheus"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "reqps",
-          "unitScale": true
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 5
-      },
-      "id": 1,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate({__name__=~\"http_server_request_duration_seconds_count|http_server_request_duration_count|http_server_duration_milliseconds_count|http_server_duration_seconds_count|http_server_duration_count\", job=~\"$job\", instance=~\"$instance\"}[5m]))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Request Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prometheus"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percentunit",
-          "unitScale": true
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 13
-      },
-      "id": 2,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "expr": "sum(rate({__name__=~\"http_server_request_duration_seconds_count|http_server_request_duration_count|http_server_duration_milliseconds_count|http_server_duration_seconds_count|http_server_duration_count\", job=~\"$job\", instance=~\"$instance\", http_response_status_code=~\"5..\"}[5m])) / sum(rate({__name__=~\"http_server_request_duration_seconds_count|http_server_request_duration_count|http_server_duration_milliseconds_count|http_server_duration_seconds_count|http_server_duration_count\", job=~\"$job\", instance=~\"$instance\"}[5m]))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Error Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prometheus"
-      },
-      "description": "",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "reqps",
-          "unitScale": true
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 21
-      },
-      "id": 3,
-      "options": {
-        "displayMode": "gradient",
-        "maxVizHeight": 300,
-        "minVizHeight": 10,
-        "minVizWidth": 0,
-        "namePlacement": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": ["lastNotNull"],
-          "fields": "",
-          "values": false
-        },
-        "showUnfilled": true,
-        "sizing": "auto",
-        "valueMode": "color"
-      },
-      "pluginVersion": "10.3.3",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "exemplar": true,
-          "expr": "sum by (le) (rate({__name__=~\"http_server_request_duration_seconds_bucket|http_server_request_duration_bucket|http_server_duration_milliseconds_bucket|http_server_duration_seconds_bucket|http_server_duration_bucket\", job=~\"$job\", instance=~\"$instance\"}[5m]))",
-          "format": "heatmap",
-          "instant": false,
-          "legendFormat": "{{le}}",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Duration histogram (s)",
-      "type": "bargauge"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prometheus"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "scaleDistribution": {
-              "type": "linear"
-            }
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 29
-      },
-      "id": 5,
-      "options": {
-        "calculate": false,
-        "cellGap": 1,
-        "color": {
-          "exponent": 0.5,
-          "fill": "dark-orange",
-          "mode": "scheme",
-          "reverse": false,
-          "scale": "exponential",
-          "scheme": "Oranges",
-          "steps": 64
-        },
-        "exemplars": {
-          "color": "rgba(255,0,255,0.7)"
-        },
-        "filterValues": {
-          "le": 1e-9
-        },
-        "legend": {
-          "show": true
-        },
-        "rowsFrame": {
-          "layout": "auto"
-        },
-        "tooltip": {
-          "show": true,
-          "yHistogram": false
-        },
-        "yAxis": {
-          "axisPlacement": "left",
-          "reverse": false,
-          "unit": "s"
-        }
-      },
-      "pluginVersion": "10.2.0",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "exemplar": false,
-          "expr": "sum by (le) (rate({__name__=~\"http_server_request_duration_seconds_bucket|http_server_request_duration_bucket|http_server_duration_milliseconds_bucket|http_server_duration_seconds_bucket|http_server_duration_bucket\", job=~\"$job\", instance=~\"$instance\"}[5m]))",
-          "format": "heatmap",
-          "instant": false,
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Duration Heatmap",
-      "type": "heatmap"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prometheus"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green"
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 37
-      },
-      "id": 4,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.5.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "exemplar": true,
-          "expr": "histogram_quantile(0.95, sum by (le) (rate({__name__=~\"http_server_request_duration_seconds_bucket|http_server_request_duration_bucket|http_server_duration_milliseconds_bucket|http_server_duration_seconds_bucket|http_server_duration_bucket\", job=~\"$job\", instance=~\"$instance\"}[5m])))",
-          "format": "time_series",
-          "instant": false,
-          "legendFormat": "95th",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "exemplar": true,
-          "expr": "histogram_quantile(0.5, sum by (le) (rate({__name__=~\"http_server_request_duration_seconds_bucket|http_server_request_duration_bucket|http_server_duration_milliseconds_bucket|http_server_duration_seconds_bucket|http_server_duration_bucket\", job=~\"$job\", instance=~\"$instance\"}[5m])))",
-          "hide": false,
-          "legendFormat": "50th",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Duration percentiles",
-      "type": "timeseries"
-    }
-  ],
-  "refresh": "",
-  "schemaVersion": 39,
-  "tags": [],
-  "templating": {
-    "list": [
-      {
-        "allValue": ".+",
-        "current": {
-          "selected": true,
-          "text": ["All"],
-          "value": ["$__all"]
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "definition": "label_values(job)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "",
-        "multi": true,
-        "name": "job",
-        "options": [],
-        "query": {
-          "query": "label_values(job)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "allValue": ".+",
-        "current": {
-          "selected": true,
-          "text": ["All"],
-          "value": ["$__all"]
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "definition": "label_values({job=~\"$job\"},instance)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "instance",
-        "multi": true,
-        "name": "instance",
-        "options": [],
-        "query": {
-          "query": "label_values({job=~\"$job\"},instance)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-30m",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "RED Metrics (classic histogram)",
-  "uid": "f543a537-cb96-470d-a349-660ad1513136",
-  "version": 1,
-  "weekStart": ""
-}
@@ -1,514 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "type": "dashboard"
-      }
-    ]
-  },
-  "description": "request rate, error rate, duration",
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "datasource": {
-        "type": "datasource",
-        "uid": "grafana"
-      },
-      "description": "",
-      "gridPos": {
-        "h": 5,
-        "w": 12,
-        "x": 0,
-        "y": 0
-      },
-      "id": 6,
-      "options": {
-        "code": {
-          "language": "plaintext",
-          "showLineNumbers": false,
-          "showMiniMap": false
-        },
-        "content": "# RED Metrics: (r)equest rate, (e)rror rate, (d)uration\n\nThis dashboard uses exponential histograms and the stable [OpenTelemetry metrics semantic conventions](https://opentelemetry.io/docs/specs/semconv/general/metrics/).\nTo enable this for the [OpenTelemetry Java instrumentation agent](https://github.com/open-telemetry/opentelemetry-java-instrumentation/), set the following environment variables:\n\n```\nexport OTEL_EXPORTER_OTLP_METRICS_DEFAULT_HISTOGRAM_AGGREGATION=base2_exponential_bucket_histogram\n```",
-        "mode": "markdown"
-      },
-      "pluginVersion": "10.3.3",
-      "type": "text"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prometheus"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "reqps",
-          "unitScale": true
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 5
-      },
-      "id": 1,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "expr": "sum(histogram_count(rate({__name__=~\"http_server_request_duration_seconds|http_server_request_duration|http_server_duration_milliseconds|http_server_duration_seconds|http_server_duration\", job=~\"$job\", instance=~\"$instance\"}[5m])))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Request Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prometheus"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "percentunit",
-          "unitScale": true
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 13
-      },
-      "id": 2,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "expr": "sum(histogram_count(rate({__name__=~\"http_server_request_duration_seconds|http_server_request_duration|http_server_duration_milliseconds|http_server_duration_seconds|http_server_duration\", job=~\"$job\", instance=~\"$instance\", http_response_status_code=~\"5..\"}[5m]))) / sum(histogram_count(rate({__name__=~\"http_server_request_duration_seconds|http_server_request_duration|http_server_duration_milliseconds|http_server_duration_seconds|http_server_duration\", job=~\"$job\", instance=~\"$instance\"}[5m])))\n\n",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Error Rate",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prometheus"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "custom": {
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "scaleDistribution": {
-              "type": "linear"
-            }
-          },
-          "unitScale": true
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 21
-      },
-      "id": 5,
-      "options": {
-        "calculate": false,
-        "cellGap": 1,
-        "color": {
-          "exponent": 0.5,
-          "fill": "dark-orange",
-          "mode": "scheme",
-          "reverse": false,
-          "scale": "exponential",
-          "scheme": "Oranges",
-          "steps": 64
-        },
-        "exemplars": {
-          "color": "rgba(255,0,255,0.7)"
-        },
-        "filterValues": {
-          "le": 1e-9
-        },
-        "legend": {
-          "show": true
-        },
-        "rowsFrame": {
-          "layout": "auto"
-        },
-        "tooltip": {
-          "mode": "single",
-          "showColorScale": false,
-          "yHistogram": false
-        },
-        "yAxis": {
-          "axisPlacement": "left",
-          "reverse": false,
-          "unit": "s"
-        }
-      },
-      "pluginVersion": "10.3.3",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "exemplar": true,
-          "expr": "sum(rate({__name__=~\"http_server_request_duration_seconds|http_server_request_duration|http_server_duration_milliseconds|http_server_duration_seconds|http_server_duration\",job=~\"$job\", instance=~\"$instance\"}[5m]))",
-          "format": "time_series",
-          "instant": false,
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Duration Heatmap",
-      "type": "heatmap"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "prometheus"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisBorderShow": false,
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "insertNulls": false,
-            "lineInterpolation": "linear",
-            "lineWidth": 1,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "off"
-            }
-          },
-          "mappings": [],
-          "min": 0,
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "green",
-                "value": null
-              },
-              {
-                "color": "red",
-                "value": 80
-              }
-            ]
-          },
-          "unit": "s",
-          "unitScale": true
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 8,
-        "w": 12,
-        "x": 0,
-        "y": 29
-      },
-      "id": 4,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "pluginVersion": "9.5.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "exemplar": true,
-          "expr": "histogram_quantile(0.95, sum(rate({__name__=~\"http_server_request_duration_seconds|http_server_request_duration|http_server_duration_milliseconds|http_server_duration_seconds|http_server_duration\",job=~\"$job\", instance=~\"$instance\"}[5m])))",
-          "format": "time_series",
-          "instant": false,
-          "legendFormat": "95th",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "prometheus"
-          },
-          "editorMode": "code",
-          "exemplar": true,
-          "expr": "histogram_quantile(0.5, sum(rate({__name__=~\"http_server_request_duration_seconds|http_server_request_duration|http_server_duration_milliseconds|http_server_duration_seconds|http_server_duration\",job=~\"$job\", instance=~\"$instance\"}[5m])))",
-          "hide": false,
-          "legendFormat": "50th",
-          "range": true,
-          "refId": "B"
-        }
-      ],
-      "title": "Duration percentiles",
-      "type": "timeseries"
-    }
-  ],
-  "refresh": "",
-  "schemaVersion": 39,
-  "tags": [],
-  "templating": {
-    "list": [
-      {
-        "allValue": ".+",
-        "current": {
-          "selected": true,
-          "text": ["All"],
-          "value": ["$__all"]
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "definition": "label_values(job)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "",
-        "multi": true,
-        "name": "job",
-        "options": [],
-        "query": {
-          "query": "label_values(job)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "allValue": ".+",
-        "current": {
-          "selected": true,
-          "text": ["All"],
-          "value": ["$__all"]
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "prometheus"
-        },
-        "definition": "label_values({job=~\"$job\"},instance)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "instance",
-        "multi": true,
-        "name": "instance",
-        "options": [],
-        "query": {
-          "query": "label_values({job=~\"$job\"},instance)",
-          "refId": "PrometheusVariableQueryEditor-VariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-30m",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "RED Metrics (native histogram)",
-  "uid": "f543a537-cb96-470d-a349-660ad1513135",
-  "version": 1,
-  "weekStart": ""
-}
@@ -1,23 +0,0 @@
-apiVersion: 1
-
-providers:
-  - name: "RED Metrics (classic histogram)"
-    type: file
-    options:
-      path: /usr/share/grafana/grafana-dashboard-red-metrics-classic.json
-      foldersFromFilesStructure: false
-  - name: "RED Metrics (exponential/native histogram)"
-    type: file
-    options:
-      path: /usr/share/grafana/grafana-dashboard-red-metrics-native.json
-      foldersFromFilesStructure: false
-  - name: "JVM Metrics"
-    type: file
-    options:
-      path: /usr/share/grafana/grafana-dashboard-jvm-metrics.json
-      foldersFromFilesStructure: false
-  - name: "OpenTelemetry Collector HostMetrics (Node Exporter)"
-    type: file
-    options:
-      path: /usr/share/grafana/opentelemetry-collector-hostmetrics-node-exporter.json
-      foldersFromFilesStructure: false
@@ -1,52 +0,0 @@
-apiVersion: 1
-
-datasources:
-  - name: Mimir
-    type: prometheus
-    uid: mimir
-    url: http://127.0.0.1:9009/prometheus
-    access: proxy
-    isDefault: true
-    editable: true
-    jsonData:
-      timeInterval: 60s
-      exemplarTraceIdDestinations:
-        - name: trace_id
-          datasourceUid: tempo
-          urlDisplayLabel: "Trace: $${__value.raw}"
-
-  - name: Tempo
-    type: tempo
-    uid: tempo
-    url: http://127.0.0.1:3200
-    editable: true
-    jsonData:
-      tracesToLogsV2:
-        customQuery: true
-        datasourceUid: "loki"
-        query: '{$${__tags}} | trace_id = "$${__trace.traceId}"'
-        tags:
-          - key: "service.name"
-            value: "service_name"
-
-      serviceMap:
-        datasourceUid: "mimir"
-      search:
-        hide: false
-      nodeGraph:
-        enabled: true
-      lokiSearch:
-        datasourceUid: "loki"
-  - name: Loki
-    type: loki
-    uid: loki
-    url: http://127.0.0.1:3100
-    editable: true
-    jsonData:
-      derivedFields:
-        - name: "trace_id"
-          matcherType: "label"
-          matcherRegex: "trace_id"
-          url: "$${__value.raw}"
-          datasourceUid: "tempo"
-          urlDisplayLabel: "Trace: $${__value.raw}"
@@ -1,45 +0,0 @@
-auth_enabled: false
-
-server:
-  http_listen_port: 3100
-  grpc_listen_port: 9097
-
-common:
-  instance_addr: 127.0.0.1
-  path_prefix: /data/loki
-  storage:
-    filesystem:
-      chunks_directory: /data/loki/chunks
-      rules_directory: /data/loki/rules
-  replication_factor: 1
-  ring:
-    kvstore:
-      store: inmemory
-
-schema_config:
-  configs:
-    - from: 2020-10-24
-      store: tsdb
-      object_store: filesystem
-      schema: v13
-      index:
-        prefix: index_
-        period: 24h
-
-ruler:
-  alertmanager_url: http://127.0.0.1:9093
-
-pattern_ingester:
-  lifecycler:
-    min_ready_duration: 1s
-
-ingester:
-  lifecycler:
-    min_ready_duration: 1s
-
-frontend:
-  scheduler_dns_lookup_period: 1s
-  address: 127.0.0.1:9097
-
-query_scheduler:
-  use_scheduler_ring: false
@@ -1,52 +0,0 @@
-# Mimir monolithic mode configuration for local development.
-# Do not use this configuration in production.
-
-activity_tracker:
-  filepath: /data/mimir/metrics-activity.log
-
-multitenancy_enabled: false
-
-server:
-  http_listen_port: 9009
-  log_level: warn
-
-blocks_storage:
-  backend: filesystem
-  bucket_store:
-    sync_dir: /data/mimir/tsdb-sync
-  filesystem:
-    dir: /data/mimir/data/tsdb
-  tsdb:
-    dir: /data/mimir/tsdb
-
-compactor:
-  data_dir: /data/mimir/compactor
-  sharding_ring:
-    kvstore:
-      store: memberlist
-
-distributor:
-  ring:
-    instance_addr: 127.0.0.1
-    kvstore:
-      store: memberlist
-
-ingester:
-  ring:
-    instance_addr: 127.0.0.1
-    kvstore:
-      store: memberlist
-    replication_factor: 1
-
-ruler:
-  rule_path: /data/mimir/ruler
-  alertmanager_url: http://127.0.0.1:9093
-
-ruler_storage:
-  backend: filesystem
-  filesystem:
-    dir: /data/mimir/rules
-
-store_gateway:
-  sharding_ring:
-    replication_factor: 1
@@ -1,43 +0,0 @@
-receivers:
-  otlp:
-    protocols:
-      http:
-        endpoint: 0.0.0.0:4318
-
-extensions:
-  health_check:
-    endpoint: 127.0.0.1:13133
-    path: "/ready"
-
-processors:
-  batch:
-
-exporters:
-  otlphttp/metrics:
-    endpoint: http://127.0.0.1:9009/otlp
-    tls:
-      insecure: true
-  otlphttp/traces:
-    endpoint: http://127.0.0.1:4418
-    tls:
-      insecure: true
-  otlphttp/logs:
-    endpoint: http://127.0.0.1:3100/otlp
-    tls:
-      insecure: true
-
-service:
-  extensions: [health_check]
-  pipelines:
-    traces:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [otlphttp/traces]
-    metrics:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [otlphttp/metrics]
-    logs:
-      receivers: [otlp]
-      processors: [batch]
-      exporters: [otlphttp/logs]
@@ -1,58 +0,0 @@
-[supervisord]
-nodaemon=true
-user=root
-logfile=/var/log/supervisor/supervisord.log
-pidfile=/var/run/supervisord.pid
-
-[rpcinterface:supervisor]
-supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface
-
-[unix_http_server]
-file = /run/supervisord.sock
-chmod = 0700
-
-[program:mimir]
-command=/usr/bin/mimir -config.file=/etc/mimir/mimir.yaml
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:loki]
-command=/usr/bin/loki -config.file=/etc/loki/loki.yaml
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:tempo]
-command=/usr/bin/tempo -config.file=/etc/tempo/tempo.yaml
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:otelcol]
-command=/usr/local/bin/otelcol-contrib --config=/etc/otelcol/otelcol.yaml
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
-
-[program:grafana]
-directory=/usr/share/grafana
-command=/usr/bin/grafana server --homepath=/usr/share/grafana --config=/etc/grafana.ini --homepath=/usr/share/grafana --packaging=docker
-autostart=true
-autorestart=true
-stdout_logfile=/dev/stdout
-stdout_logfile_maxbytes=0
-stderr_logfile=/dev/stderr
-stderr_logfile_maxbytes=0
@@ -1,51 +0,0 @@
-server:
-  http_listen_port: 3200
-  grpc_listen_port: 9096
-
-live_store:
-  shutdown_marker_dir: /data/tempo/live-store/shutdown-marker
-  wal:
-    path: /data/tempo/live-store/traces
-
-distributor:
-  receivers:
-    otlp:
-      protocols:
-        grpc:
-          endpoint: "127.0.0.1:4417"
-        http:
-          endpoint: "127.0.0.1:4418"
-
-memberlist:
-  bind_addr: [127.0.0.1]
-  bind_port: 7947
-
-querier:
-  frontend_worker:
-    frontend_address: 127.0.0.1:9096
-
-storage:
-  trace:
-    backend: local
-    wal:
-      path: /data/tempo/wal
-    local:
-      path: /data/tempo/blocks
-
-metrics_generator:
-  processor:
-    span_metrics:
-      dimensions:
-        - service_name
-        - operation
-        - status_code
-  storage:
-    path: /data/tempo/generator/wal
-    remote_write:
-      - url: http://127.0.0.1:9009/api/v1/write
-        send_exemplars: true
-
-overrides:
-  defaults:
-    metrics_generator:
-      processors: [service-graphs, span-metrics]
@@ -1,15 +1,15 @@
-ARG PG_VERSION=18.5 ALPINE_VERSION=3.24
-FROM postgres:${PG_VERSION}-alpine${ALPINE_VERSION} AS build
+ARG PG_VERSION=17
+FROM postgres:${PG_VERSION}-alpine AS build

 ARG PGVECTOR_VERSION
 WORKDIR /
 RUN apk update
-RUN apk add gcc make musl-dev clang21 llvm21 git
+RUN apk add gcc make musl-dev clang19 llvm19 git
 RUN git clone --branch v${PGVECTOR_VERSION} https://github.com/pgvector/pgvector.git pgvector
 WORKDIR pgvector
 RUN make
 RUN make install

-FROM postgres:${PG_VERSION}-alpine${ALPINE_VERSION} AS release
+FROM postgres:alpine AS release
 RUN rm -rf /usr/local
 COPY --from=build /usr/local /usr/local
@@ -1,9 +1,10 @@
 FROM --platform=$BUILDPLATFORM gitea.woggioni.net/woggioni/arch-builder:rust-full AS base

 ARG VERSION TARGETPLATFORM BUILDPLATFORM
+
 WORKDIR /home/luser/shadowsocks-rust
-#ADD --chown=luser:luser git@github.com:shadowsocks/shadowsocks-rust.git#v${VERSION} .
-RUN git clone --depth 1 --branch "v${VERSION}" https://github.com/shadowsocks/shadowsocks-rust.git .
+
+ADD --chown=luser:luser git@github.com:shadowsocks/shadowsocks-rust.git#v${VERSION} .

 FROM base AS builder-linux_386
 ENV RUST_TARGET="i686-unknown-linux-musl"
@@ -23,7 +24,7 @@ ENV RUST_TARGET="arm-unknown-linux-musleabihf"
 ENV CC_armv7_unknown_linux_musleabihf=/opt/x-tools/arm-unknown-linux-musleabi/bin/arm-unknown-linux-musleabi-gcc
 ENV CXX_armv7_unknown_linux_musleabihf=/opt/x-tools/arm-unknown-linux-musleabi/bin/arm-unknown-linux-musleabi-g++

-FROM builder-${TARGETPLATFORM//\//_} AS builder
+FROM builder-${TARGETPLATFORM/\//_} AS builder
 RUN rustup target add $RUST_TARGET
 RUN cargo +stable build --locked --target "$RUST_TARGET" --release --features "full,aead-cipher-extra,aead-cipher-2022-extra,security-replay-attack-detect" \
    && mv target/$RUST_TARGET/release/ss* target/release/
@@ -39,8 +40,8 @@ FROM busybox:musl AS sslocal
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/target/release/sslocal /usr/bin/
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/examples/config.json /etc/shadowsocks-rust/
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/docker/docker-entrypoint.sh /usr/bin/
-COPY --from=builder --chown=root:root --chmod=755 /tmp/v2ray-plugin /usr/bin/v2ray-plugin
-COPY --from=builder --chown=root:root --chmod=755 /tmp/xray-plugin /usr/bin/xray-plugin
+COPY --from=builder --chown=root:root /tmp/v2ray-plugin /usr/bin/v2ray-plugin
+COPY --from=builder --chown=root:root /tmp/xray-plugin /usr/bin/xray-plugin

 ENTRYPOINT [ "docker-entrypoint.sh" ]
 CMD [ "sslocal", "--log-without-time", "-c", "/etc/shadowsocks-rust/config.json" ]
@@ -50,8 +51,8 @@ FROM busybox:musl AS ssserver
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/target/release/ssserver /usr/bin/
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/examples/config.json /etc/shadowsocks-rust/
 COPY --from=builder --chown=root:root /home/luser/shadowsocks-rust/docker/docker-entrypoint.sh /usr/bin/
-COPY --from=builder --chown=root:root --chmod=755 /tmp/v2ray-plugin /usr/bin/v2ray-plugin
-COPY --from=builder --chown=root:root --chmod=755 /tmp/xray-plugin /usr/bin/xray-plugin
+COPY --from=builder /tmp/v2ray-plugin /usr/bin/v2ray-plugin
+COPY --from=builder /tmp/xray-plugin /usr/bin/xray-plugin

 ENTRYPOINT [ "docker-entrypoint.sh" ]

@@ -1,25 +1,25 @@
 #!/usr/bin/env sh
-set -e
 TARGETPLATFORM=$1
-PLUGIN_VERSION=1.260327.0
+PLUGIN_VERSION=1.8.24
 mkdir /tmp/xray_plugin.d
 cd /tmp/xray_plugin.d
 case "$TARGETPLATFORM" in
    "linux/386")
-        url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-i386"
+        url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-386-linux/1.8.24/xray-plugin-linux-386-v1.8.24.tar.gz"
    ;;
    "linux/amd64")
-        url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-x86_64"
+        url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-amd64-linux/1.8.24/xray-plugin-linux-amd64-v1.8.24.tar.gz"
    ;;
    "linux/arm64")
-        url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-aarch64"
+        url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-arm64-linux/1.8.24/xray-plugin-linux-arm64-v1.8.24.tar.gz"
    ;;
    "linux/arm/v7")
-        url="https://gitea.woggioni.net/api/packages/woggioni/generic/shadowsocks-xray-plugin/${PLUGIN_VERSION}/shadowsocks-xray-plugin-linux-armv7h"
+        url="https://gitea.woggioni.net/api/packages/woggioni/generic/xray-plugin-arm-linux/1.8.24/xray-plugin-linux-arm-v1.8.24.tar.gz"
    ;;
    *)
        echo "Doesn't support $TARGETPLATFORM architecture"
        exit 1
    ;;
 esac
-curl --fail -L --retry 3 "$url" -o /tmp/xray-plugin
+curl --retry 3 "$url" | tar -xvz
+mv xray-plugin* /tmp/xray-plugin
@@ -1,5 +0,0 @@
-ARG VERSION
-FROM matrixdotorg/synapse:v${VERSION}
-USER root
-RUN python -m pip install synapse-s3-storage-provider
-USER 1000
@@ -1,8 +1,8 @@
-FROM alpine:3.23 AS base
+FROM alpine:3.22 AS base

 FROM base AS build
 ARG VERSION
-RUN --mount=type=cache,target=/var/cache/apk apk add gcc g++ musl-dev cmake ninja hwloc-dev libuv-dev openssl-dev git upx linux-headers
+RUN --mount=type=cache,target=/var/cache/apk apk add gcc g++ musl-dev cmake ninja hwloc-dev libuv-dev openssl-dev git upx
 RUN adduser -D -S -h /home/luser luser
 WORKDIR /home/luser
 USER luser
Author	SHA1	Message	Date
woggioni	dea708dc13	try to fix ganymede build CI / Build nginx docker images (push) Has been cancelled Details CI / Build Jupyter Ganymede docker images (push) Has been cancelled Details	2025-12-23 22:01:43 +08:00
woggioni	4bfbdedac0	added rtmp module to nginx image	2025-12-23 22:01:43 +08:00