diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 6b54ae68..8cd91efe 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -1,5 +1,18 @@ version: '3' services: + nginx: + image: nginx + ports: + - 80:80 + - 443:443 + depends_on: + - appflowy_cloud + - gotrue + volumes: + - ./nginx/nginx.conf:/etc/nginx/nginx.conf + - ./nginx/ssl/certificate.crt:/etc/nginx/ssl/certificate.crt + - ./nginx/ssl/private_key.key:/etc/nginx/ssl/private_key.key + postgres: build: context: . diff --git a/docker-compose.yml b/docker-compose.yml index 4562e4b1..73f36f8b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,8 +3,8 @@ services: nginx: image: nginx ports: + - 80:80 - 443:443 - - 9997:9997 depends_on: - appflowy_cloud - gotrue diff --git a/nginx/nginx.conf b/nginx/nginx.conf index 50fb1c66..bb7a0c2e 100644 --- a/nginx/nginx.conf +++ b/nginx/nginx.conf @@ -10,20 +10,21 @@ http { ssl_certificate /etc/nginx/ssl/certificate.crt; ssl_certificate_key /etc/nginx/ssl/private_key.key; + listen 80; listen 443 ssl; + + # GoTrue + location /verify { + proxy_pass http://gotrue:9999; + } + location /callback { + proxy_pass http://gotrue:9999; + } + + # AppFlowy-Cloud location / { proxy_pass http://appflowy_cloud:8000; } } - server { - ssl_certificate /etc/nginx/ssl/certificate.crt; - ssl_certificate_key /etc/nginx/ssl/private_key.key; - - listen 9997 ssl; - location / { - proxy_pass http://gotrue:9999; - } - } - }