Merge pull request #6784 from readthedocs/humitos/cors-and-init

Author: humitos

common

@@ -86,12 +86,12 @@ services:
     image: microsoft/azure-cli
     volumes:
       - ${PWD}/common/dockerfiles/scripts/create-containers.sh:/usr/local/bin/create-containers.sh
+    environment:
+      - INIT=${INIT:-}
     links:
       - storage
     depends_on:
       - storage
     networks:
       readthedocs:
     command: ["/usr/local/bin/create-containers.sh"]
-    environment:
-      - INIT=${INIT:-}

docker-compose.override.yml

@@ -9,14 +9,6 @@ server {
         break;
     }
 
-    # FIXME: this is a workaround because CORS on the storage.
-    # The command to enable it is failing without reason:
-    # pip install azure-cli
-    # AZURE_STORAGE_CONNECTION_STRING="UseDevelopmentStorage=true" az storage cors add --origins 'community.dev.readthedocs.io' --services 'b' --methods GET OPTIONS HEAD --allowed-headers '*'
-    location /devstoreaccount1 {
-        proxy_pass http://storage:10000$request_uri;
-    }
-
     location / {
         proxy_pass http://web:8000/;
         proxy_set_header X-Forwarded-Host $host;

dockerfiles/nginx/web.conf

@@ -22,7 +22,7 @@ class DockerBaseSettings(CommunityDevSettings):
     SLUMBER_API_HOST = 'http://web:8000'
     RTD_EXTERNAL_VERSION_DOMAIN = 'org.dev.readthedocs.build'
 
-    STATIC_URL = f'http://{PRODUCTION_DOMAIN}/devstoreaccount1/static/'
+    STATIC_URL = '/devstoreaccount1/static/'
 
     # In the local docker environment, nginx should be trusted to set the host correctly
     USE_X_FORWARDED_HOST = True
@@ -117,7 +117,7 @@ def DATABASES(self):  # noqa
 
     # Storage backend for build media artifacts (PDF, HTML, ePub, etc.)
     RTD_BUILD_MEDIA_STORAGE = 'readthedocs.storage.azure_storage.AzureBuildMediaStorage'
-    AZURE_STATIC_STORAGE_HOSTNAME = PRODUCTION_DOMAIN
+    AZURE_STATIC_STORAGE_HOSTNAME = 'assets.community.dev.readthedocs.io:10000'
 
     # Storage backend for build cached environments
     RTD_BUILD_ENVIRONMENT_STORAGE = 'readthedocs.storage.azure_storage.AzureBuildEnvironmentStorage'