feat: add dashboard Traefik route and CAMELEER_TENANT_ID config
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -27,3 +27,4 @@ DOMAIN=localhost
|
|||||||
CAMELEER_AUTH_TOKEN=change_me_bootstrap_token
|
CAMELEER_AUTH_TOKEN=change_me_bootstrap_token
|
||||||
CAMELEER_CONTAINER_MEMORY_LIMIT=512m
|
CAMELEER_CONTAINER_MEMORY_LIMIT=512m
|
||||||
CAMELEER_CONTAINER_CPU_SHARES=512
|
CAMELEER_CONTAINER_CPU_SHARES=512
|
||||||
|
CAMELEER_TENANT_SLUG=default
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ jobs:
|
|||||||
- name: Build and Test (unit tests only)
|
- name: Build and Test (unit tests only)
|
||||||
run: >-
|
run: >-
|
||||||
mvn clean verify -B
|
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:
|
docker:
|
||||||
needs: build
|
needs: build
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ jobs:
|
|||||||
- name: Build, Test and Analyze
|
- name: Build, Test and Analyze
|
||||||
run: >-
|
run: >-
|
||||||
mvn clean verify sonar:sonar --batch-mode
|
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.host.url=${{ secrets.SONAR_HOST_URL }}
|
||||||
-Dsonar.token=${{ secrets.SONAR_TOKEN }}
|
-Dsonar.token=${{ secrets.SONAR_TOKEN }}
|
||||||
-Dsonar.projectKey=cameleer-saas
|
-Dsonar.projectKey=cameleer-saas
|
||||||
|
|||||||
@@ -94,6 +94,7 @@ services:
|
|||||||
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/${POSTGRES_DB:-cameleer_saas}
|
SPRING_DATASOURCE_URL: jdbc:postgresql://postgres:5432/${POSTGRES_DB:-cameleer_saas}
|
||||||
CLICKHOUSE_URL: jdbc:clickhouse://clickhouse:8123/cameleer
|
CLICKHOUSE_URL: jdbc:clickhouse://clickhouse:8123/cameleer
|
||||||
CAMELEER_AUTH_TOKEN: ${CAMELEER_AUTH_TOKEN:-default-bootstrap-token}
|
CAMELEER_AUTH_TOKEN: ${CAMELEER_AUTH_TOKEN:-default-bootstrap-token}
|
||||||
|
CAMELEER_TENANT_ID: ${CAMELEER_TENANT_SLUG:-default}
|
||||||
labels:
|
labels:
|
||||||
- traefik.enable=true
|
- traefik.enable=true
|
||||||
- traefik.http.routers.observe.rule=PathPrefix(`/observe`)
|
- 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.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.middlewares.forward-auth.forwardauth.authResponseHeaders=X-Tenant-Id,X-User-Id,X-User-Email
|
||||||
- traefik.http.services.observe.loadbalancer.server.port=8080
|
- 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:
|
networks:
|
||||||
- cameleer
|
- cameleer
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user