Merge branch 'dev' into beta

This commit is contained in:
2025-04-14 18:56:54 +02:00

View File

@@ -2,59 +2,28 @@ version: "3"
services: services:
web: web:
image: registry.gitlab.com/cmykmedia/spaces:main-WEB image: reg.federspiel.software/fedeo/software:beta
restart: always restart: always
networks: # networks:
- traefik # - traefik
environment: environment:
SUPABASE_URL: "https://uwppvcxflrcsibuzsbil.supabase.co" SUPABASE_URL: "https://uwppvcxflrcsibuzsbil.supabase.co"
SUPABASE_KEY: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InV3cHB2Y3hmbHJjc2lidXpzYmlsIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDA5MzgxOTQsImV4cCI6MjAxNjUxNDE5NH0.CkxYSQH0uLfwx9GVUlO6AYMU2FMLAxGMrwEKvyPv7Oo" SUPABASE_KEY: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InV3cHB2Y3hmbHJjc2lidXpzYmlsIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDA5MzgxOTQsImV4cCI6MjAxNjUxNDE5NH0.CkxYSQH0uLfwx9GVUlO6AYMU2FMLAxGMrwEKvyPv7Oo"
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik"
- "traefik.port=3000"
# Middlewares
- "traefik.http.middlewares.spaces-frontend-redirect-web-secure.redirectscheme.scheme=https"
# Web Entrypoint
- "traefik.http.routers.spaces-frontend.middlewares=spaces-frontend-redirect-web-secure"
- "traefik.http.routers.spaces-frontend.rule=Host(`app.spaces.software`)"
- "traefik.http.routers.spaces-frontend.entrypoints=web"
# Web Secure Entrypoint
- "traefik.http.routers.spaces-frontend-secure.rule=Host(`app.spaces.software`)"
- "traefik.http.routers.spaces-frontend-secure.entrypoints=web-secured" #
- "traefik.http.routers.spaces-frontend-secure.tls.certresolver=mytlschallenge"
# imapsync:
# image: registry.gitlab.com/cmykmedia/spaces:main-IMAPSYNC
# restart: always
# environment:
# SUPABASE_URL: "https://uwppvcxflrcsibuzsbil.supabase.co"
# SUPABASE_KEY: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InV3cHB2Y3hmbHJjc2lidXpzYmlsIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImlhdCI6MTcwMDkzODE5NCwiZXhwIjoyMDE2NTE0MTk0fQ.6hOkD1J8XBkVJUm-swv0ngLQ74xrEYr28EEbo0rUrts"
# INTERVAL: 30
#
# hardwaregateway:
# image: registry.gitlab.com/cmykmedia/spaces:main-HARDWAREGATEWAY
# restart: always
# networks:
# - traefik
# environment:
# SUPABASE_URL: "https://uwppvcxflrcsibuzsbil.supabase.co"
# SUPABASE_SERVICE_ROLE_KEY: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InV3cHB2Y3hmbHJjc2lidXpzYmlsIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImlhdCI6MTcwMDkzODE5NCwiZXhwIjoyMDE2NTE0MTk0fQ.6hOkD1J8XBkVJUm-swv0ngLQ74xrEYr28EEbo0rUrts"
# labels: # labels:
# - "traefik.enable=true" # - "traefik.enable=true"
# - "traefik.docker.network=traefik" # - "traefik.docker.network=traefik"
# - "traefik.port=3000" # - "traefik.port=3000"
# # Middlewares # # Middlewares
# - "traefik.http.middlewares.spaces-gateway-redirect-web-secure.redirectscheme.scheme=https" # - "traefik.http.middlewares.spaces-frontend-redirect-web-secure.redirectscheme.scheme=https"
# # Web Entrypoint # # Web Entrypoint
# - "traefik.http.routers.spaces-gateway.middlewares=spaces-gateway-redirect-web-secure" # - "traefik.http.routers.spaces-frontend.middlewares=spaces-frontend-redirect-web-secure"
# - "traefik.http.routers.spaces-gateway.rule=Host(`gw.spaces.software`)" # - "traefik.http.routers.spaces-frontend.rule=Host(`app.spaces.software`)"
# - "traefik.http.routers.spaces-gateway.entrypoints=web" # - "traefik.http.routers.spaces-frontend.entrypoints=web"
# # Web Secure Entrypoint # # Web Secure Entrypoint
# - "traefik.http.routers.spaces-gateway-secure.rule=Host(`gw.spaces.software`)" # - "traefik.http.routers.spaces-frontend-secure.rule=Host(`app.spaces.software`)"
# - "traefik.http.routers.spaces-gateway-secure.entrypoints=web-secured" # # - "traefik.http.routers.spaces-frontend-secure.entrypoints=web-secured" #
# - "traefik.http.routers.spaces-gateway-secure.tls.certresolver=mytlschallenge" # - "traefik.http.routers.spaces-frontend-secure.tls.certresolver=mytlschallenge"
networks: #networks:
traefik: # traefik:
external: true # external: true