From: Dan Timoney <dtimoney@att.com>
Date: Sat, 1 Jul 2017 23:07:51 +0000 (+0000)
Subject: Merge "Add proxy support"
X-Git-Tag: v1.2.1~148
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a0aaa333acb0f1f39530ec2c486dcffbf390210e;hp=468f6d28a1a27fcdd5440e714ef93b038ba49247;p=sdnc%2Foam.git

Merge "Add proxy support"

Former-commit-id: cee38293eb9f404449769c75c9ad107f639d373b
---

diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml
index bb9acfb2..d3af2dff 100644
--- a/installation/src/main/yaml/docker-compose.yml
+++ b/installation/src/main/yaml/docker-compose.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 networks:
   default:
@@ -38,6 +38,8 @@ services:
     environment:
       - MYSQL_ROOT_PASSWORD=openECOMP1.0
       - SDNC_CONFIG_DIR=/opt/openecomp/sdnc/data/properties
+    dns:
+      - ${DNS_IP_ADDR-10.0.100.1}
     logging:
       driver:   "json-file"
       options: