Merge branch 'next' into next

templates/compose/logto.yaml

@@ -9,7 +9,7 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
-    entrypoint: ["sh", "-c", "npm run alteration deploy latest && npm run cli db seed -- --swe && npm start'"]
+    entrypoint: ["sh", "-c", "npm run cli db seed -- --swe && npm start"]
     environment:
       - SERVICE_FQDN_LOGTO
       - TRUST_PROXY_HEADER=1

templates/compose/plunk.yaml

@@ -22,7 +22,7 @@ services:
       - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
       - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
       - AWS_SES_CONFIGURATION_SET=${AWS_SES_CONFIGURATION_SET}
-      - NEXT_PUBLIC_API_URI=${API_URI}
+      - NEXT_PUBLIC_API_URI=${SERVICE_FQDN_PLUNK}/api
       - APP_URI=${SERVICE_FQDN_PLUNK}
       - API_URI=${SERVICE_FQDN_PLUNK}/api
       - DISABLE_SIGNUPS=False

templates/compose/postiz.yaml

@@ -3,21 +3,30 @@
 # slogan:
 # tags:
 # logo:
-# port: 5000
+# port: 4200
 
 services:
   postiz:
     image: "ghcr.io/gitroomhq/postiz-app:latest"
     environment:
-      - SERVICE_FQDN_POSTIZ_5000
+      - SERVICE_FQDN_POSTIZ_4200
       - MAIN_URL=${SERVICE_FQDN_POSTIZ}
       - FRONTEND_URL=${SERVICE_FQDN_POSTIZ}
-      - NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZ_3000}
+      - NEXT_PUBLIC_BACKEND_URL=${SERVICE_FQDN_POSTIZAPI_3000}
       - JWT_SECRET=${SERVICE_REALBASE64_JWTSECRET}
       - DATABASE_URL=postgresql://${SERVICE_USER_POSTGRES}:${SERVICE_PASSWORD_POSTGRES}@postgres:5432/${POSTGRES_DB:-postiz}?schema=public
       - REDIS_URL=redis://redis:6379
-      - BACKEND_INTERNAL_URL=${SERVICE_FQDN_POSTIZ}
+      - BACKEND_INTERNAL_URL=http://localhost:3000/
       - IS_GENERAL=true
+      - CLOUDFLARE_ACCOUNT_ID=${CLOUDFLARE_ACCOUNT_ID}
+      - CLOUDFLARE_ACCESS_KEY=${CLOUDFLARE_ACCESS_KEY}
+      - CLOUDFLARE_SECRET_ACCESS_KEY=${CLOUDFLARE_SECRET_ACCESS_KEY}
+      - CLOUDFLARE_BUCKETNAME=${CLOUDFLARE_BUCKETNAME}
+      - CLOUDFLARE_BUCKET_URL=${CLOUDFLARE_BUCKET_URL}
+      - CLOUDFLARE_REGION=${CLOUDFLARE_REGION}
+      - RESEND_API_KEY=${RESEND_API_KEY}
+      - EMAIL_FROM_ADDRESS=${EMAIL_FROM_ADDRESS}
+      - EMAIL_FROM_NAME=${EMAIL_FROM_NAME}
     depends_on:
       postgres:
         condition: service_healthy

templates/compose/twenty.yaml

@@ -8,7 +8,7 @@ services:
   twenty:
     image: 'twentycrm/twenty:latest'
     environment:
-      - SERVICE_FQDN_TRIGGER_3000
+      - SERVICE_FQDN_TWENTY_3000
       - SERVER_URL=$SERVICE_FQDN_TWENTY
       - FRONT_BASE_URL=$SERVICE_FQDN_TWENTY
       - ENABLE_DB_MIGRATIONS=true

templates/compose/uptime-kuma.yaml

@@ -8,7 +8,7 @@ services:
   uptime-kuma:
     image: louislam/uptime-kuma:1
     environment:
-      - SERVICE_FQDN_UPTIME-KUMA_3001
+      - SERVICE_FQDN_UPTIMEKUMA_3001
     volumes:
       - uptime-kuma:/app/data
     healthcheck: