diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 9dc944b..d6573cc 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -24,6 +24,8 @@ services: environment: SPRING_PROFILES_ACTIVE: dev SPRING_WEB_RESOURCES_STATIC_LOCATIONS: file:/app/static/,classpath:/static/ + PUBLIC_HOST: ${PUBLIC_HOST:-localhost} + PUBLIC_PROTOCOL: ${PUBLIC_PROTOCOL:-https} CAMELEER_SERVER_IMAGE: gitea.siegeln.net/cameleer/cameleer3-server:${VERSION:-latest} CAMELEER_SERVER_UI_IMAGE: gitea.siegeln.net/cameleer/cameleer3-server-ui:${VERSION:-latest} CAMELEER_NETWORK: cameleer-saas_cameleer diff --git a/src/main/java/net/siegeln/cameleer/saas/provisioning/DockerTenantProvisioner.java b/src/main/java/net/siegeln/cameleer/saas/provisioning/DockerTenantProvisioner.java index 760c725..8d5d894 100644 --- a/src/main/java/net/siegeln/cameleer/saas/provisioning/DockerTenantProvisioner.java +++ b/src/main/java/net/siegeln/cameleer/saas/provisioning/DockerTenantProvisioner.java @@ -127,9 +127,13 @@ public class DockerTenantProvisioner implements TenantProvisioner { "SPRING_DATASOURCE_URL=" + props.datasourceUrl(), "SPRING_DATASOURCE_USERNAME=cameleer", "SPRING_DATASOURCE_PASSWORD=cameleer_dev", + "CLICKHOUSE_URL=jdbc:clickhouse://clickhouse:8123/cameleer", "CAMELEER_TENANT_ID=" + slug, + "CAMELEER_AUTH_TOKEN=" + req.licenseToken(), + "CAMELEER_JWT_SECRET=cameleer-dev-jwt-secret-change-in-production", "CAMELEER_OIDC_ISSUER_URI=" + props.oidcIssuerUri(), "CAMELEER_OIDC_JWK_SET_URI=" + props.oidcJwkSetUri(), + "CAMELEER_OIDC_AUDIENCE=https://api.cameleer.local", "CAMELEER_OIDC_TLS_SKIP_VERIFY=true", "CAMELEER_CORS_ALLOWED_ORIGINS=" + props.corsOrigins(), "CAMELEER_LICENSE_TOKEN=" + req.licenseToken(),