Docker composer links alias don't currently work as expected

Author: JeroenBoersma

bin/dev

@@ -38,7 +38,7 @@ init() {
     DEV_YML='';
     dc yml 'docker-compose.yml';
     dc yml_if 'build/dist/docker-compose-blackfire.yml' 'conf/blackfire';
-    dc yml_if 'build/dist/docker-compose-varnish.yml' 'conf/varnish.vcl' || dc yml 'build/dist/docker-compose-no-varnish.yml';
+    dc yml_if 'build/dist/docker-compose-varnish.yml' 'conf/varnish.vcl';
     dc yml_if 'build/dist/docker-compose-elasticsearch.yml' 'conf/elasticsearch';
     dc yml_if 'build/dist/docker-compose-elasticsearch7.yml' 'conf/elasticsearch7';
     dc yml_if 'build/dist/docker-compose-elasticsearchhq.yml' 'conf/elasticsearchhq';

build/dist/docker-compose-no-varnish.yml

@@ -8,6 +8,6 @@ services:
   ssl:
     depends_on:
       - varnish
-    links:
-      - "varnish:backend"
+    volumes:
+      - ./build/dist/varnish/nginx/nginx.conf:/etc/nginx/nginx.conf:ro
 

build/dist/docker-compose-varnish.yml

@@ -44,7 +44,7 @@ http {
             proxy_set_header X-Forwarded-For $remote_addr;
             proxy_set_header X-Https $https;
 
-            proxy_pass http://backend:80;
+            proxy_pass http://web:80;
 
             proxy_buffer_size 32k;
             proxy_buffers 4 64k;

build/dist/ssl/nginx/nginx.conf

@@ -0,0 +1,53 @@
+
+worker_processes 4;
+pid /run/nginx.pid;
+
+error_log stderr;
+
+events {
+    worker_connections 1024;
+    # multi_accept on;
+}
+
+http {
+    sendfile on;
+    tcp_nopush on;
+    tcp_nodelay on;
+
+    keepalive_timeout 65;
+    proxy_connect_timeout 300;
+    proxy_send_timeout    300;
+    proxy_read_timeout    300;
+
+    types_hash_max_size 2048;
+
+    log_format docker '[$time_local] - $scheme://$host$uri '
+                        '"$request" $status $body_bytes_sent '
+                        '"$http_referer" "$http_user_agent"';
+    access_log /dev/stdout docker;
+
+    client_max_body_size 32m;
+
+    gzip on;
+
+
+    server {
+        listen 80;
+        listen 443 ssl http2;
+
+        http2_max_concurrent_streams 2048;
+
+        include "ssl.conf";
+
+        location / {
+            proxy_set_header Host $host;
+            proxy_set_header X-Forwarded-For $remote_addr;
+            proxy_set_header X-Https $https;
+
+            proxy_pass http://varnish:80;
+
+            proxy_buffer_size 32k;
+            proxy_buffers 4 64k;
+        }
+    }
+}