Skip to content

Adjust examples for new .well-known/tenzir-platform endpoint #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lava wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

Adjust examples for new .well-known/tenzir-platform endpoint #65

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d238160
Adjust examples for new .well-known/tenzir-platform endpoint
lava Jan 16, 2025
d8ff834
continue work on device code stuff
lava Jan 16, 2025
774232b
Update to latest tenant-manager changes
tobim Feb 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/tenant-manager
Open in desktop
Submodule tenant-manager updated from 9e6cab to f275be
4 changes: 4 additions & 0 deletions examples/localdev/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@ services:
- TENANT_MANAGER_AUTH__ENABLE_SELF_SIGNED=false
- TENANT_MANAGER_AUTH__TRUSTED_AUDIENCES=${TENZIR_PLATFORM_OIDC_TRUSTED_AUDIENCES}
- TENANT_MANAGER_AUTH__ADMIN_FUNCTIONS=${TENZIR_PLATFORM_OIDC_ADMIN_RULES}
- TENANT_MANAGER_OIDC__ISSUER_URL=${TENZIR_PLATFORM_OIDC_PROVIDER_ISSUER_URL}
- TENANT_MANAGER_OIDC__CLI_CLIENT_ID=tenzir-cli
- TENANT_MANAGER_OIDC__NODE_CLIENT_ID=tenzir-node
- TENANT_MANAGER_OIDC__APP_CLIENT_ID=tenzir-app
- STORE__TYPE=${TENZIR_PLATFORM_STORE_TYPE}
- STORE__POSTGRES_URI=postgresql://${TENZIR_PLATFORM_POSTGRES_USER}:${TENZIR_PLATFORM_POSTGRES_PASSWORD}@${TENZIR_PLATFORM_POSTGRES_HOSTNAME}/${TENZIR_PLATFORM_POSTGRES_DB}
# seaweedfs s3 connection
Expand Down
54 changes: 30 additions & 24 deletions examples/tenzir-developers/docker-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,49 @@
# Container ports are mapped to the range 3000-3004

services:
app:
image: ghcr.io/tenzir/app:${TENZIR_PLATFORM_VERSION:-latest}
#build: ../../components/app
environment:
- AUTH_TRUST_HOST=true
- PUBLIC_ENABLE_HIGHLIGHT=false
- ORIGIN=${TENZIR_PLATFORM_DOMAIN}
- PRIVATE_OIDC_PROVIDER_CLIENT_ID=${TENZIR_PLATFORM_APP_CLIENT_ID}
- PRIVATE_OIDC_PROVIDER_CLIENT_SECRET=${TENZIR_PLATFORM_APP_CLIENT_SECRET}
- PRIVATE_OIDC_PROVIDER_ISSUER_URL=${TENZIR_PLATFORM_OIDC_PROVIDER_ISSUER_URL}
- PRIVATE_OIDC_PROVIDER_NAME=${TENZIR_PLATFORM_OIDC_PROVIDER_NAME}
- PUBLIC_OIDC_PROVIDER_ID=${TENZIR_PLATFORM_OIDC_PROVIDER_NAME}
- PUBLIC_WEBSOCKET_GATEWAY_ENDPOINT=${TENZIR_PLATFORM_CONTROL_ENDPOINT}
- PRIVATE_USER_ENDPOINT=http://platform:5000/user
- PRIVATE_WEBAPP_ENDPOINT=http://platform:5000/webapp
- PRIVATE_WEBAPP_KEY=${TENZIR_PLATFORM_INTERNAL_APP_API_KEY}
- AUTH_SECRET=${TENZIR_PLATFORM_INTERNAL_AUTH_SECRET}
- PRIVATE_DRIZZLE_DATABASE_URL=postgres://${TENZIR_PLATFORM_POSTGRES_USER}:${TENZIR_PLATFORM_POSTGRES_PASSWORD}@${TENZIR_PLATFORM_POSTGRES_HOSTNAME}/${TENZIR_PLATFORM_POSTGRES_DB}
depends_on:
- postgres
ports:
- "3000:3000"

platform:
# image: ghcr.io/tenzir/platform:${TENZIR_PLATFORM_VERSION:-latest}
build: ../../components/tenant-manager/platform/tenant_manager/
command: ["tenant_manager/rest/server/local.py"]
environment:
- DOMAIN=${TENZIR_PLATFORM_API_ENDPOINT}
- BASE_PATH=
- GATEWAY_WS_ENDPOINT=${TENZIR_PLATFORM_CONTROL_ENDPOINT}
- GATEWAY_HTTP_ENDPOINT=http://websocket-gateway:5000
- GATEWAY_PUBLIC_HTTP_ENDPOINT=${TENZIR_PLATFORM_PROXY_ENDPOINT}
- TENZIR_DEMO_NODE_IMAGE=${TENZIR_PLATFORM_DEMO_NODE_IMAGE:-tenzir/tenzir-demo:latest}
- TENANT_MANAGER_APP_API_KEY=${TENZIR_PLATFORM_INTERNAL_APP_API_KEY}
- TENANT_MANAGER_TENANT_TOKEN_ENCRYPTION_KEY=${TENZIR_PLATFORM_INTERNAL_TENANT_TOKEN_ENCRYPTION_KEY}
- TENANT_MANAGER_AUTH__ENABLE_SELF_SIGNED=false
- TENANT_MANAGER_AUTH__TRUSTED_AUDIENCES=${TENZIR_PLATFORM_OIDC_TRUSTED_AUDIENCES}
- TENANT_MANAGER_AUTH__ADMIN_FUNCTIONS=${TENZIR_PLATFORM_OIDC_ADMIN_RULES}
- OIDC__ISSUER_URL=${TENZIR_PLATFORM_OIDC_PROVIDER_ISSUER_URL}
- OIDC__CLI_CLIENT_ID=${TENZIR_PLATFORM_CLI_CLIENT_ID}
- OIDC__NODE_CLIENT_ID=${TENZIR_PLATFORM_NODE_CLIENT_ID}
- OIDC__APP_CLIENT_ID=${TENZIR_PLATFORM_APP_CLIENT_ID}
- STORE__TYPE=${TENZIR_PLATFORM_STORE_TYPE}
- STORE__POSTGRES_URI=postgresql://${TENZIR_PLATFORM_POSTGRES_USER}:${TENZIR_PLATFORM_POSTGRES_PASSWORD}@${TENZIR_PLATFORM_POSTGRES_HOSTNAME}/${TENZIR_PLATFORM_POSTGRES_DB}
# seaweedfs s3 connection
Expand Down Expand Up @@ -49,30 +78,7 @@ services:
- postgres
command: ["tenant_manager/ws/server/local.py"]
ports:
- 3099:5000

app:
# image: ghcr.io/tenzir/app:${TENZIR_PLATFORM_VERSION:-latest}
build: ../../components/app
environment:
- AUTH_TRUST_HOST=true
- PUBLIC_ENABLE_HIGHLIGHT=false
- ORIGIN=${TENZIR_PLATFORM_DOMAIN}
- PRIVATE_OIDC_PROVIDER_CLIENT_ID=${TENZIR_PLATFORM_APP_CLIENT_ID}
- PRIVATE_OIDC_PROVIDER_CLIENT_SECRET=${TENZIR_PLATFORM_APP_CLIENT_SECRET}
- PRIVATE_OIDC_PROVIDER_ISSUER_URL=${TENZIR_PLATFORM_OIDC_PROVIDER_ISSUER_URL}
- PRIVATE_OIDC_PROVIDER_NAME=${TENZIR_PLATFORM_OIDC_PROVIDER_NAME}
- PUBLIC_OIDC_PROVIDER_ID=${TENZIR_PLATFORM_OIDC_PROVIDER_NAME}
- PUBLIC_WEBSOCKET_GATEWAY_ENDPOINT=${TENZIR_PLATFORM_CONTROL_ENDPOINT}
- PRIVATE_USER_ENDPOINT=http://platform:5000/user
- PRIVATE_WEBAPP_ENDPOINT=http://platform:5000/webapp
- PRIVATE_WEBAPP_KEY=${TENZIR_PLATFORM_INTERNAL_APP_API_KEY}
- AUTH_SECRET=${TENZIR_PLATFORM_INTERNAL_AUTH_SECRET}
- PRIVATE_DRIZZLE_DATABASE_URL=postgres://${TENZIR_PLATFORM_POSTGRES_USER}:${TENZIR_PLATFORM_POSTGRES_PASSWORD}@${TENZIR_PLATFORM_POSTGRES_HOSTNAME}/${TENZIR_PLATFORM_POSTGRES_DB}
depends_on:
- postgres
ports:
- "3000:3000"
- 3002:5000

cli:
# image: ghcr.io/tenzir/tenzir-platform:${TENZIR_PLATFORM_VERSION:-latest}
Expand Down
3 changes: 3 additions & 0 deletions examples/tenzir-developers/env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ TENZIR_PLATFORM_OIDC_ADMIN_RULES='[{"auth_fn":"auth_email_suffix","connection":"
# Specific OIDC Settings for the CLI
TENZIR_PLATFORM_CLI_CLIENT_ID=bkdMIMCPjLwl28J1oU4lAGr7tg107w0s

# Specific OIDC Settings for the Tenzir Node signup
TENZIR_PLATFORM_NODE_CLIENT_ID=bkbYctvS3knaieU3GIGh5aK4opP816uV

# Specific OIDC Settings for the frontend.
# (client secret can be found in 1password under the 'Auth0 Shared Account' entry)
TENZIR_PLATFORM_APP_CLIENT_ID=bTFcQLMzDiHJzxbouREVu6q1LB00vDAq
Expand Down