From d7b5b08d2d92f3659e0cdbc7b61a3ff78183a4e6 Mon Sep 17 00:00:00 2001
From: Pierre Jaury <pierre@jaury.eu>
Date: Sun, 24 Apr 2016 16:27:35 +0200
Subject: [PATCH] Use docker links for nginx to resolve properly

---
 docker-compose.yml | 3 +++
 nginx/nginx.conf   | 8 ++------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index b557d0cf..efb09cdd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,6 +9,9 @@ services:
     ports:
       - "80:80"
       - "443:443"
+    links:
+      - webmail
+      - admin
     volumes:
       - /data/certs:/certs
 
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 8c8beddc..eb700a4e 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -33,15 +33,11 @@ http {
     	}
 
       location / {
-        resolver 127.0.0.11;
-        set $webmail_backend "http://webmail";
-        proxy_pass $webmail_backend;
+        proxy_pass http://webmail;
       }
 
       location /admin {
-        resolver 127.0.0.11;
-        set $admin_backend "http://admin";
-        proxy_pass $admin_backend;
+        proxy_pass http://admin;
       }
     }
 }