[chore] add fallback to usage of the dev tld

This commit is contained in:
Eric Schubert
2026-01-30 13:41:29 +01:00
parent 1bf2e845d7
commit 27095f9635
8 changed files with 29 additions and 29 deletions
+1 -1
View File
@@ -87,7 +87,7 @@ services:
networks:
- network
environment:
__VITE_ADDITIONAL_SERVER_ALLOWED_HOSTS: "openproject-assets.${OPENPROJECT_DOCKER_DEV_TLD}"
__VITE_ADDITIONAL_SERVER_ALLOWED_HOSTS: "openproject-assets.${OPENPROJECT_DOCKER_DEV_TLD:-local}"
ports:
- "${FE_PORT:-4200}:4200"
+2 -2
View File
@@ -19,10 +19,10 @@ services:
networks:
- external
extra_hosts:
- "openproject.${OPENPROJECT_DOCKER_DEV_TLD}:host-gateway"
- "openproject.${OPENPROJECT_DOCKER_DEV_TLD:-local}:host-gateway"
labels:
- "traefik.enable=true"
- "traefik.http.routers.gitlab.rule=Host(`gitlab.${OPENPROJECT_DOCKER_DEV_TLD}`)"
- "traefik.http.routers.gitlab.rule=Host(`gitlab.${OPENPROJECT_DOCKER_DEV_TLD:-local}`)"
- "traefik.http.routers.gitlab.entrypoints=websecure"
- "traefik.http.services.gitlab.loadbalancer.server.port=80"
+2 -2
View File
@@ -5,7 +5,7 @@ services:
image: openproject/hocuspocus:latest
labels:
- "traefik.enable=true"
- "traefik.http.routers.hocuspocus.rule=Host(`hocuspocus.${OPENPROJECT_DOCKER_DEV_TLD}`)"
- "traefik.http.routers.hocuspocus.rule=Host(`hocuspocus.${OPENPROJECT_DOCKER_DEV_TLD:-local}`)"
- "traefik.http.routers.hocuspocus.service=hocuspocus-service"
- "traefik.http.routers.hocuspocus.tls=true"
- "traefik.http.services.hocuspocus-service.loadbalancer.server.port=1234"
@@ -14,7 +14,7 @@ services:
networks:
- gateway
environment:
- ALLOWED_DOMAINS=openproject.${OPENPROJECT_DOCKER_DEV_TLD},localhost
- ALLOWED_DOMAINS=openproject.${OPENPROJECT_DOCKER_DEV_TLD:-local},localhost
- NODE_TLS_REJECT_UNAUTHORIZED=0
- SECRET=secret12345
networks:
+2 -2
View File
@@ -35,7 +35,7 @@ services:
- KEYCLOAK_ADMIN=admin
- KEYCLOAK_ADMIN_PASSWORD=admin
- KC_DB_SCHEMA=public
- KC_HOSTNAME=keycloak.${OPENPROJECT_DOCKER_DEV_TLD}
- KC_HOSTNAME=keycloak.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- KC_TRANSACTION_XA_ENABLED=false
volumes:
- /etc/ssl/certs/ca-certificates.crt:/etc/ssl/certs/ca-certificates.crt:ro
@@ -43,7 +43,7 @@ services:
- ./themes/:/opt/keycloak/themes/
labels:
- "traefik.enable=true"
- "traefik.http.routers.keycloak-sub-secure.rule=Host(`keycloak.${OPENPROJECT_DOCKER_DEV_TLD}`)"
- "traefik.http.routers.keycloak-sub-secure.rule=Host(`keycloak.${OPENPROJECT_DOCKER_DEV_TLD:-local}`)"
- "traefik.http.routers.keycloak-sub-secure.entrypoints=websecure"
depends_on:
- db-keycloak
+2 -2
View File
@@ -19,13 +19,13 @@ services:
- "traefik.enable=true"
# MinIO API
- "traefik.http.routers.minio.entrypoints=websecure"
- "traefik.http.routers.minio.rule=Host(`minio.${OPENPROJECT_DOCKER_DEV_TLD}`)"
- "traefik.http.routers.minio.rule=Host(`minio.${OPENPROJECT_DOCKER_DEV_TLD:-local}`)"
- "traefik.http.routers.minio.service=minio"
- "traefik.http.routers.minio.tls.certresolver=step"
- "traefik.http.services.minio.loadbalancer.server.port=9000"
# MinIO Admin Console (Management UI)
- "traefik.http.routers.minioadmin.entrypoints=websecure"
- "traefik.http.routers.minioadmin.rule=Host(`minioadmin.${OPENPROJECT_DOCKER_DEV_TLD}`)"
- "traefik.http.routers.minioadmin.rule=Host(`minioadmin.${OPENPROJECT_DOCKER_DEV_TLD:-local}`)"
- "traefik.http.routers.minioadmin.service=minioadmin"
- "traefik.http.routers.minioadmin.tls.certresolver=step"
- "traefik.http.services.minioadmin.loadbalancer.server.port=9001"
+1 -1
View File
@@ -11,7 +11,7 @@ services:
# - ../nextcloud_apps:/var/www/html/custom_apps
labels:
- "traefik.enable=true"
- "traefik.http.routers.nextcloud.rule=Host(`nextcloud.${OPENPROJECT_DOCKER_DEV_TLD}`)"
- "traefik.http.routers.nextcloud.rule=Host(`nextcloud.${OPENPROJECT_DOCKER_DEV_TLD:-local}`)"
- "traefik.http.routers.nextcloud.entrypoints=websecure"
cron:
@@ -6,30 +6,30 @@ x-op-env-override: &environment
SSL_CERT_FILE: /etc/ssl/certs/ca-certificates.crt
# uncomment and set all the envs below to integrate keycloak with OpenProject
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_DISPLAY__NAME: Keycloak
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_HOST: keycloak.${OPENPROJECT_DOCKER_DEV_TLD}
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_IDENTIFIER: https://openproject.${OPENPROJECT_DOCKER_DEV_TLD}
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_HOST: keycloak.${OPENPROJECT_DOCKER_DEV_TLD:-local}
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_IDENTIFIER: https://openproject.${OPENPROJECT_DOCKER_DEV_TLD:-local}
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_SECRET: <The client secret you copied from keycloak>
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_ISSUER: https://keycloak.${OPENPROJECT_DOCKER_DEV_TLD}/realms/<REALM>
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_ISSUER: https://keycloak.${OPENPROJECT_DOCKER_DEV_TLD:-local}/realms/<REALM>
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_AUTHORIZATION__ENDPOINT: /realms/<REALM>/protocol/openid-connect/auth
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_TOKEN__ENDPOINT: /realms/<REALM>/protocol/openid-connect/token
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_USERINFO__ENDPOINT: /realms/<REALM>/protocol/openid-connect/userinfo
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_END__SESSION__ENDPOINT: https://keycloak.${OPENPROJECT_DOCKER_DEV_TLD}/realms/<REALM>/protocol/openid-connect/logout
# OPENPROJECT_OPENID__CONNECT_KEYCLOAK_END__SESSION__ENDPOINT: https://keycloak.${OPENPROJECT_DOCKER_DEV_TLD:-local}/realms/<REALM>/protocol/openid-connect/logout
# uncomment the following for using minio (local S3) as file storage with TLS support:
# OPENPROJECT_ATTACHMENTS__STORAGE: "fog"
# OPENPROJECT_FOG_DIRECTORY: "openproject-uploads"
# OPENPROJECT_FOG_CREDENTIALS_PROVIDER: "AWS" # Minio is S3 compliant, so we can use the AWS provider
# OPENPROJECT_FOG_CREDENTIALS_ENDPOINT: "https://minio.${OPENPROJECT_DOCKER_DEV_TLD}"
# OPENPROJECT_FOG_CREDENTIALS_ENDPOINT: "https://minio.${OPENPROJECT_DOCKER_DEV_TLD:-local}"
# OPENPROJECT_FOG_CREDENTIALS_AWS__ACCESS__KEY__ID: "minioadmin"
# OPENPROJECT_FOG_CREDENTIALS_AWS__SECRET__ACCESS__KEY: "minioadmin"
# OPENPROJECT_FOG_CREDENTIALS_PATH__STYLE: "true"
# OPENPROJECT_FOG_CREDENTIALS_REGION: "us-east-1"
# OPENPROJECT_DEV_EXTRA_HOSTS: "${OPENPROJECT_DEV_HOST},minio.${OPENPROJECT_DOCKER_DEV_TLD}"
# OPENPROJECT_DEV_EXTRA_HOSTS: "${OPENPROJECT_DEV_HOST},minio.${OPENPROJECT_DOCKER_DEV_TLD:-local}"
services:
backend:
environment:
<<: *environment
OPENPROJECT_CLI_PROXY: "https://openproject-assets.${OPENPROJECT_DOCKER_DEV_TLD}"
OPENPROJECT_CLI_PROXY: "https://openproject-assets.${OPENPROJECT_DOCKER_DEV_TLD:-local}"
networks:
- external
volumes:
@@ -42,7 +42,7 @@ services:
# - ~/.step/certs:/usr/local/share/ca-certificates
labels:
- "traefik.enable=true"
- "traefik.http.routers.openproject.rule=Host(`openproject.${OPENPROJECT_DOCKER_DEV_TLD}`)"
- "traefik.http.routers.openproject.rule=Host(`openproject.${OPENPROJECT_DOCKER_DEV_TLD:-local}`)"
- "traefik.http.routers.openproject.entrypoints=websecure"
worker:
@@ -77,7 +77,7 @@ services:
- external
labels:
- "traefik.enable=true"
- "traefik.http.routers.openproject-assets.rule=Host(`openproject-assets.${OPENPROJECT_DOCKER_DEV_TLD}`)"
- "traefik.http.routers.openproject-assets.rule=Host(`openproject-assets.${OPENPROJECT_DOCKER_DEV_TLD:-local}`)"
- "traefik.http.routers.openproject-assets.entrypoints=websecure"
# You need to define the same external network
+10 -10
View File
@@ -13,17 +13,17 @@ services:
networks:
external:
aliases:
- traefik.${OPENPROJECT_DOCKER_DEV_TLD}
- openproject.${OPENPROJECT_DOCKER_DEV_TLD}
- openproject-assets.${OPENPROJECT_DOCKER_DEV_TLD}
- nextcloud.${OPENPROJECT_DOCKER_DEV_TLD}
- gitlab.${OPENPROJECT_DOCKER_DEV_TLD}
- keycloak.${OPENPROJECT_DOCKER_DEV_TLD}
- hocuspocus.${OPENPROJECT_DOCKER_DEV_TLD}
- minio.${OPENPROJECT_DOCKER_DEV_TLD}
- minioadmin.${OPENPROJECT_DOCKER_DEV_TLD}
- traefik.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- openproject.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- openproject-assets.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- nextcloud.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- gitlab.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- keycloak.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- hocuspocus.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- minio.${OPENPROJECT_DOCKER_DEV_TLD:-local}
- minioadmin.${OPENPROJECT_DOCKER_DEV_TLD:-local}
labels:
- "traefik.http.routers.traefik.rule=Host(`traefik.${OPENPROJECT_DOCKER_DEV_TLD}`)"
- "traefik.http.routers.traefik.rule=Host(`traefik.${OPENPROJECT_DOCKER_DEV_TLD:-local}`)"
- "traefik.http.routers.traefik.service=api@internal"
- "traefik.http.routers.traefik.entrypoints=websecure"