From 9f8d0f43ab11f134d37d88f26daaaf695d3b0367 Mon Sep 17 00:00:00 2001 From: hsiegeln <37154749+hsiegeln@users.noreply.github.com> Date: Sat, 4 Apr 2026 21:04:57 +0200 Subject: [PATCH] feat: add dashboard Traefik route and CAMELEER_TENANT_ID config Co-Authored-By: Claude Sonnet 4.6 --- .env.example | 1 + .gitea/workflows/ci.yml | 2 +- .gitea/workflows/sonarqube.yml | 2 +- docker-compose.yml | 5 +++++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.env.example b/.env.example index c7ac9be..ef88828 100644 --- a/.env.example +++ b/.env.example @@ -27,3 +27,4 @@ DOMAIN=localhost CAMELEER_AUTH_TOKEN=change_me_bootstrap_token CAMELEER_CONTAINER_MEMORY_LIMIT=512m CAMELEER_CONTAINER_CPU_SHARES=512 +CAMELEER_TENANT_SLUG=default diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 46a4c32..c31d03d 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -30,7 +30,7 @@ jobs: - name: Build and Test (unit tests only) run: >- mvn clean verify -B - -Dsurefire.excludes="**/AuthControllerTest.java,**/TenantControllerTest.java,**/LicenseControllerTest.java,**/AuditRepositoryTest.java,**/CameleerSaasApplicationTest.java,**/EnvironmentControllerTest.java,**/AppControllerTest.java,**/DeploymentControllerTest.java" + -Dsurefire.excludes="**/AuthControllerTest.java,**/TenantControllerTest.java,**/LicenseControllerTest.java,**/AuditRepositoryTest.java,**/CameleerSaasApplicationTest.java,**/EnvironmentControllerTest.java,**/AppControllerTest.java,**/DeploymentControllerTest.java,**/AgentStatusControllerTest.java" docker: needs: build diff --git a/.gitea/workflows/sonarqube.yml b/.gitea/workflows/sonarqube.yml index cda62f1..9c062c3 100644 --- a/.gitea/workflows/sonarqube.yml +++ b/.gitea/workflows/sonarqube.yml @@ -28,7 +28,7 @@ jobs: - name: Build, Test and Analyze run: >- mvn clean verify sonar:sonar --batch-mode - -Dsurefire.excludes="**/AuthControllerTest.java,**/TenantControllerTest.java,**/LicenseControllerTest.java,**/AuditRepositoryTest.java,**/CameleerSaasApplicationTest.java,**/EnvironmentControllerTest.java,**/AppControllerTest.java,**/DeploymentControllerTest.java" + -Dsurefire.excludes="**/AuthControllerTest.java,**/TenantControllerTest.java,**/LicenseControllerTest.java,**/AuditRepositoryTest.java,**/CameleerSaasApplicationTest.java,**/EnvironmentControllerTest.java,**/AppControllerTest.java,**/DeploymentControllerTest.java,**/AgentStatusControllerTest.java" -Dsonar.host.url=${{ secrets.SONAR_HOST_URL }} -Dsonar.token=${{ secrets.SONAR_TOKEN }} -Dsonar.projectKey=cameleer-saas diff --git a/docker-compose.yml b/docker-compose.yml index 9e6e693..3220989 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -94,6 +94,7 @@ services: SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/${POSTGRES_DB:-cameleer_saas} CLICKHOUSE_URL: jdbc:clickhouse://clickhouse:8123/cameleer CAMELEER_AUTH_TOKEN: ${CAMELEER_AUTH_TOKEN:-default-bootstrap-token} + CAMELEER_TENANT_ID: ${CAMELEER_TENANT_SLUG:-default} labels: - traefik.enable=true - traefik.http.routers.observe.rule=PathPrefix(`/observe`) @@ -101,6 +102,10 @@ services: - traefik.http.middlewares.forward-auth.forwardauth.address=http://cameleer-saas:8080/auth/verify - traefik.http.middlewares.forward-auth.forwardauth.authResponseHeaders=X-Tenant-Id,X-User-Id,X-User-Email - traefik.http.services.observe.loadbalancer.server.port=8080 + - traefik.http.routers.dashboard.rule=PathPrefix(`/dashboard`) + - traefik.http.routers.dashboard.middlewares=forward-auth,dashboard-strip + - traefik.http.middlewares.dashboard-strip.stripprefix.prefixes=/dashboard + - traefik.http.services.dashboard.loadbalancer.server.port=8080 networks: - cameleer