Merge remote-tracking branch 'origin/master'

templates/docker-compose.yml.twig

@@ -59,7 +59,9 @@ services:
       - php
     environment:
 {% if webserver.type == 'nginx' %}
-      NGINX_DRUPAL_FILE_PROXY_URL: 'https://{{ live.uri }}'
+{% if live is defined and live.uri is defined %}
+      NGINX_DRUPAL_FILE_PROXY_URL: '{{ live.uri }}'
+{% endif %}
       NGINX_STATIC_CONTENT_OPEN_FILE_CACHE: 'off'
       NGINX_ERROR_LOG_LEVEL: debug
 {% elseif webserver.type == 'apache' %}