Many Changes for 1.0

This commit is contained in:
2024-02-04 20:21:09 +01:00
parent bd09d07698
commit fa661ff6b3
17 changed files with 1220 additions and 88 deletions

View File

@@ -7,7 +7,8 @@ services:
networks:
- traefik
environment:
STRAPI_URL: "http://federspiel-tech.spaces.software:1337"
SUPABASE_URL: "https://uwppvcxflrcsibuzsbil.supabase.co"
SUPABASE_KEY: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InV3cHB2Y3hmbHJjc2lidXpzYmlsIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDA5MzgxOTQsImV4cCI6MjAxNjUxNDE5NH0.CkxYSQH0uLfwx9GVUlO6AYMU2FMLAxGMrwEKvyPv7Oo"
labels:
- "traefik.enable=true"
- "traefik.docker.network=traefik"
@@ -16,10 +17,10 @@ services:
- "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(`ft.spaces.software`)"
- "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(`ft.spaces.software`)"
- "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"
@@ -31,37 +32,29 @@ services:
SUPABASE_KEY: "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InV3cHB2Y3hmbHJjc2lidXpzYmlsIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIsImlhdCI6MTcwMDkzODE5NCwiZXhwIjoyMDE2NTE0MTk0fQ.6hOkD1J8XBkVJUm-swv0ngLQ74xrEYr28EEbo0rUrts"
INTERVAL: 30
# backend:
# image: registry.gitlab.com/cmykmedia/manordsonne:master-BACKEND
# restart: always
# networks:
# - traefik
# expose:
# - 8080
# environment:
# COMPANY_RECIPIENT: "info@ma-nordsonne.de"
# REQUEST_PORT: 8080
# SMTP_USER: "info@ma-nordsonne.de"
# SMTP_HOST: "stmp.strato.de"
# SMTP_PASSWORD: "nM.-XiPM9rJd4y_Qk4*sTAeBr.GdVkAJxuUkzH2gugEU@BfsaYf-mf4ith6b7khXXFD29ZfmmRZfR@TTtb*WXKHYGLbBE3ubc7@4"
# SMTP_PORT: 465
# SMTP_SSL: "false"
# labels:
# - "traefik.enable=true"
# - "traefik.docker.network=traefik"
# - "traefik.port=8080"
# # Middlewares
# - "traefik.http.middlewares.manordsonne-backend-redirect-web-secure.redirectscheme.scheme=https"
# ###
# - "traefik.http.routers.manordsonne-backend.middlewares=manordsonne-backend-redirect-web-secure"
# - "traefik.http.routers.manordsonne-backend.rule=Host(`backend.ma-nordsonne.de`)"
# - "traefik.http.routers.manordsonne-backend.entrypoints=web"
# ####
# - "traefik.http.routers.manordsonne-backend-secure.rule=Host(`backend.ma-nordsonne.de`)"
# - "traefik.http.routers.manordsonne-backend-secure.entrypoints=web-secured"
# - "traefik.http.routers.manordsonne-backend-secure.tls.certresolver=mytlschallenge"
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:
- "traefik.enable=true"
- "traefik.docker.network=traefik"
- "traefik.port=3000"
# Middlewares
- "traefik.http.middlewares.spaces-gateway-redirect-web-secure.redirectscheme.scheme=https"
# Web Entrypoint
- "traefik.http.routers.spaces-gateway.middlewares=spaces-gateway-redirect-web-secure"
- "traefik.http.routers.spaces-gateway.rule=Host(`gw.spaces.software`)"
- "traefik.http.routers.spaces-gateway.entrypoints=web"
# Web Secure Entrypoint
- "traefik.http.routers.spaces-gateway-secure.rule=Host(`gw.spaces.software`)"
- "traefik.http.routers.spaces-gateway-secure.entrypoints=web-secured" #
- "traefik.http.routers.spaces-gateway-secure.tls.certresolver=mytlschallenge"
networks:
traefik:
external: true
external: true