From 8e7ac713c450eb2be07d81e48833f021ecbcd9dc Mon Sep 17 00:00:00 2001
From: Nicolas Oliver <dario.n.oliver@intel.com>
Date: Fri, 2 Jun 2017 08:53:04 -0700
Subject: [PATCH] docker-compose.yaml: enable environment configuration of
 build variables

Signed-off-by: Nicolas Oliver <dario.n.oliver@intel.com>
Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 docker-compose.yaml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index be231460..102e82e4 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: '2'
+version: '2.1'
 
 services:
 
@@ -10,21 +10,21 @@ services:
         - http_proxy
         - https_proxy
         - no_proxy
-        - BUILDDOC=OFF
-        - BUILDCPP=ON
-        - BUILDFTI=ON
-        - BUILDSWIGPYTHON=OFF
-        - BUILDSWIGJAVA=OFF
-        - BUILDSWIGNODE=OFF
-        - BUILDEXAMPLES=ON
-        - IPK=OFF
-        - RPM=OFF
-        - NPM=OFF
-        - BUILDTESTS=ON
-        - CC=clang-3.8
-        - CXX=clang++-3.8
-        - NODE_VERSION=v4.1.2
-        - WERROR=ON
+        - BUILDDOC=${BUILDDOC:-OFF}
+        - BUILDCPP=${BUILDCPP:-ON}
+        - BUILDFTI=${BUILDFTI:-ON}
+        - BUILDSWIGPYTHON=${BUILDSWIGPYTHON:-OFF}
+        - BUILDSWIGJAVA=${BUILDSWIGJAVA:-OFF}
+        - BUILDSWIGNODE=${BUILDSWIGJAVA:-OFF}
+        - BUILDEXAMPLES=${BUILDEXAMPLE:-ON}
+        - IPK=${IPK:-OFF}
+        - RPM=${RPM:-OFF}
+        - NPM=${NPM:-OFF}
+        - BUILDTESTS=${BUILDTESTS:-ON}
+        - CC=${CC:-clang-3.8}
+        - CXX=${CXX:-clang++-3.8}
+        - NODE_VERSION=${NODE_VERSION:-v4.1.2}
+        - WERROR=${WERROR:-ON}
     environment:
       - http_proxy
       - https_proxy