fix: fqdn should not include scheme (#1249)

deploy.env

@@ -1,9 +1,15 @@
 # This file is a template for docker compose deployment
 # Copy this file to .env and change the values as needed
 
-# Fully qualified domain name for the deployment. Replace localhost with your domain,
-# such as http://mydomain.com.
-FQDN=http://localhost
+# Fully qualified domain name for the deployment. Replace appflowy.localhost with your domain,
+# such as mydomain.com.
+FQDN=localhost
+# Change this to https if you wish to enable TLS.
+SCHEME=http
+# If this has changed, AppFlowy Web might still use the old value due to Javascript cache.
+# If AppFlowy Web is sending requests to the wrong URL, do a hard reload on the browser,
+# and/or purge Cloudflare cache if you are using CloudFlare.
+APPFLOWY_BASE_URL=${SCHEME}://${FQDN}
 
 # PostgreSQL Settings
 POSTGRES_HOST=postgres
@@ -83,7 +89,7 @@ GOTRUE_ADMIN_PASSWORD=password
 GOTRUE_DISABLE_SIGNUP=false
 
 # External URL where the GoTrue service is exposed.
-API_EXTERNAL_URL=${FQDN}/gotrue
+API_EXTERNAL_URL=${APPFLOWY_BASE_URL}/gotrue
 
 # GoTrue connect to postgres using this url. If your password contains special characters,
 # replace ${SUPABASE_PASSWORD} with the url encoded version. For example, `p@ssword` will become `p%40ssword`
@@ -127,7 +133,7 @@ APPFLOWY_S3_BUCKET=appflowy
 # APPFLOWY_S3_REGION=us-east-1
 # Uncomment this if you are using the Minio service hosted within this docker compose file
 # This is so that, the presigned URL generated by AppFlowy Cloud will use the publicly availabe minio endpoint.
-# APPFLOWY_S3_PRESIGNED_URL_ENDPOINT=${FQDN}/minio-api
+# APPFLOWY_S3_PRESIGNED_URL_ENDPOINT=${APPFLOWY_BASE_URL}/minio-api
 
 # AppFlowy Cloud Mailer
 # Note that smtps (TLS) is always required, even for ports other than 465
@@ -167,7 +173,7 @@ AI_DATABASE_URL=postgresql+psycopg://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POS
 AI_REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
 LOCAL_AI_TEST_ENABLED=false
 AI_APPFLOWY_BUCKET_NAME=${APPFLOWY_S3_BUCKET}
-AI_APPFLOWY_HOST=${FQDN}
+AI_APPFLOWY_HOST=${APPFLOWY_BASE_URL}
 AI_MINIO_URL=http://${MINIO_HOST}:${MINIO_PORT}
 
 # AppFlowy Indexer
@@ -187,6 +193,6 @@ APPFLOWY_WORKER_DATABASE_NAME=${POSTGRES_DB}
 
 # AppFlowy Web
 # If your AppFlowy Web is hosted on a different domain, update this variable to the correct domain
-APPFLOWY_WEB_URL=${FQDN}
+APPFLOWY_WEB_URL=${APPFLOWY_BASE_URL}
 # If you are running AppFlowy Web locally for development purpose, use the following value instead
 # APPFLOWY_WEB_URL=http://localhost:3000

docker-compose.yml

@@ -17,7 +17,7 @@ services:
     restart: on-failure
     image: minio/minio
     environment:
-      - MINIO_BROWSER_REDIRECT_URL=${FQDN?:err}/minio
+      - MINIO_BROWSER_REDIRECT_URL=${APPFLOWY_BASE_URL?:err}/minio
       - MINIO_ROOT_USER=${APPFLOWY_S3_ACCESS_KEY:-minioadmin}
       - MINIO_ROOT_PASSWORD=${APPFLOWY_S3_SECRET_KEY:-minioadmin}
     command: server /data --console-address ":9001"
@@ -213,7 +213,7 @@ services:
     depends_on:
       - appflowy_cloud
     environment:
-      - AF_BASE_URL=${FQDN}
+      - AF_BASE_URL=${APPFLOWY_BASE_URL:?err}
       - AF_GOTRUE_URL=${API_EXTERNAL_URL}
 volumes:
   postgres_data: