diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 4b21ed12c..e1b8cc04a 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -38,6 +38,7 @@ jobs: run: | echo "127.0.0.1 dev.squarelet.com" | sudo tee -a /etc/hosts echo "127.0.0.1 dev.mailhog.com" | sudo tee -a /etc/hosts + echo "127.0.0.1 minio.documentcloud.org" | sudo tee -a /etc/hosts - name: Generate environment files run: python initialize_dotenvs.py @@ -53,7 +54,7 @@ jobs: -keyout config/certs/dev.squarelet.com-key.pem \ -out config/certs/dev.squarelet.com.pem \ -subj "/CN=dev.squarelet.com" \ - -addext "subjectAltName=DNS:dev.squarelet.com,DNS:*.dev.documentcloud.org,DNS:dev.muckrock.com,DNS:dev.foiamachine.org,DNS:dev.mailhog.com" + -addext "subjectAltName=DNS:dev.squarelet.com,DNS:*.dev.documentcloud.org,DNS:dev.muckrock.com,DNS:dev.foiamachine.org,DNS:dev.mailhog.com,DNS:minio.documentcloud.org" - name: Build and start services run: docker compose -f local.yml up -d --build diff --git a/compose/local/nginx/nginx.conf b/compose/local/nginx/nginx.conf index f2e3596f0..30980b42e 100644 --- a/compose/local/nginx/nginx.conf +++ b/compose/local/nginx/nginx.conf @@ -31,10 +31,23 @@ http { server { listen *:443 ssl; - server_name ~^(.*)$; + server_name minio.documentcloud.org; ssl_certificate /etc/nginx/certs/dev.squarelet.com.pem; ssl_certificate_key /etc/nginx/certs/dev.squarelet.com-key.pem; + client_max_body_size 500M; + location / { + set $minio_upstream http://minio.documentcloud.org:9000; + proxy_set_header X-Forwarded-Proto https; + proxy_set_header Host $http_host; + proxy_pass $minio_upstream; + } + } + server { + listen *:443 ssl; + server_name ~^(.*)$; + ssl_certificate /etc/nginx/certs/dev.squarelet.com.pem; + ssl_certificate_key /etc/nginx/certs/dev.squarelet.com-key.pem; location / { proxy_set_header X-Forwarded-Proto https; proxy_set_header Host $http_host; diff --git a/local.yml b/local.yml index 856771edb..4f2fb1b7d 100644 --- a/local.yml +++ b/local.yml @@ -24,6 +24,7 @@ services: - www.dev.documentcloud.org - dev.muckrock.com - dev.foiamachine.org + - minio.documentcloud.org squarelet_mailhog: image: mailhog/mailhog:v1.0.0 diff --git a/tasks.py b/tasks.py index 0d601dd8f..a4e3d67a5 100644 --- a/tasks.py +++ b/tasks.py @@ -391,5 +391,6 @@ def mkcert(c): '"*.dev.documentcloud.org" ' "dev.muckrock.com " "dev.foiamachine.org " - "dev.mailhog.com" + "dev.mailhog.com " + "minio.documentcloud.org" )