diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 16e228dd..ee96da90 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -5,6 +5,8 @@ services: ports: - 9000:9000 - 9001:9001 + environment: + - MINIO_BROWSER_REDIRECT_URL=http://localhost/minio command: server /data --console-address ":9001" postgres: diff --git a/docker-compose.yml b/docker-compose.yml index e9af9029..e40bd806 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,7 @@ services: - 80:80 - 443:443 depends_on: + - minio - appflowy_cloud - gotrue - admin_frontend @@ -19,6 +20,8 @@ services: ports: - 9000:9000 - 9001:9001 + environment: + - MINIO_BROWSER_REDIRECT_URL=http://localhost/minio command: server /data --console-address ":9001" postgres: diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 9020eddb..45cc59e5 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -18,9 +18,9 @@ http { listen 80; listen 443 ssl; - # GoTrue - location /gotrue/ { - rewrite ^/gotrue(/.*)$ $1 break; + # GoTrue + location /gotrue/ { + rewrite ^/gotrue(/.*)$ $1 break; proxy_pass http://gotrue:9999; } @@ -39,7 +39,35 @@ http { proxy_pass http://appflowy_cloud:8000; } - # PgAdmin + # Minio Web UI + # Derive from: https://min.io/docs/minio/linux/integrations/setup-nginx-proxy-with-minio.html + location /minio/ { + rewrite ^/minio/(.*) /$1 break; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_set_header X-Forwarded-Proto $scheme; + proxy_set_header X-NginX-Proxy true; + + ## This is necessary to pass the correct IP to be hashed + real_ip_header X-Real-IP; + + proxy_connect_timeout 300; + + ## To support websockets in MinIO versions released after January 2023 + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + # Some environments may encounter CORS errors (Kubernetes + Nginx Ingress) + # Uncomment the following line to set the Origin request to an empty string + # proxy_set_header Origin ''; + + chunked_transfer_encoding off; + + proxy_pass http://minio:9001; + } + + # PgAdmin location /pgadmin/ { proxy_set_header X-Script-Name /pgadmin; proxy_set_header X-Scheme $scheme; @@ -48,7 +76,7 @@ http { proxy_redirect off; } - # Admin Frontend + # Admin Frontend location / { proxy_set_header X-Scheme $scheme; proxy_set_header Host $host;