From dc03eec56f22372707e31a9797347372b0c6210a Mon Sep 17 00:00:00 2001
From: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
Date: Thu, 15 Jun 2017 09:35:12 -0700
Subject: [PATCH] docker: enable gcc4, gcc6 and node6 builds

Signed-off-by: Mihai Tudor Panu <mihai.tudor.panu@intel.com>
---
 .travis.yml         |  5 +++++
 Dockerfile          | 11 ++++++++---
 docker-compose.yaml |  5 +++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 50910f55..67742b89 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,9 @@ language: cpp
 
 compiler:
   - clang
+  - gcc-4.8
   - gcc
+  - gcc-6
 
 env:
   - TARGET=doc
@@ -12,6 +14,7 @@ env:
   - TARGET=java
   - TARGET=node4
   - TARGET=node5
+  - TARGET=node6
 
 services:
   - docker
@@ -25,6 +28,8 @@ before_install:
 before_script:
   - if [ "$CC" == "gcc-4.8" ]; then export CC=gcc-4.8; fi
   - if [ "$CXX" == "g++-4.8" ]; then export CXX=g++-4.8; fi
+  - if [ "$CC" == "gcc-6" ]; then export CC=gcc-6; fi
+  - if [ "$CXX" == "g++-6" ]; then export CXX=g++-6; fi
   - if [ "$CC" == "clang" ]; then export CC=clang-3.8; fi
   - if [ "$CXX" == "clang++" ]; then export CXX=clang++-3.8; fi
   - docker-compose build ${TARGET}
diff --git a/Dockerfile b/Dockerfile
index 739b9e0a..6f39c302 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ RUN add-apt-repository ppa:mraa/mraa && \
   # Install apt-utils
   apt-get -y --no-install-recommends install apt-utils && \
   # Main Build Dependencies
-  apt-get -y --no-install-recommends install git build-essential cmake swig clang-3.8 g++-4.8 libpthread-stubs0-dev pkg-config wget unzip \
+  apt-get -y --no-install-recommends install git build-essential cmake swig clang-3.8 gcc-4.8 g++-4.8 libpthread-stubs0-dev pkg-config wget unzip \
   # Mraa Build Dependencies
   libmraa1 libmraa-dev mraa-tools python-mraa python3-mraa libmraa-java \
   # Docs Build Dependencies
@@ -30,6 +30,11 @@ ARG CXX
 ENV CC $CC
 ENV CXX $CXX
 
+# Install GCC6 too
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test && \
+    apt-get update && \
+    apt-get -y --no-install-recommends install gcc-6 g++-6
+
 # Configure Java Home
 ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64/
 
@@ -44,9 +49,9 @@ RUN wget http://libmodbus.org/releases/libmodbus-3.1.4.tar.gz && \
     ./configure && make -j8 && make install
 
 # Install openzwave
-## TODO: Fix openzwave examples build with gcc-4.8
 RUN apt-get update && apt-get -y --no-install-recommends install libudev-dev && \
-    git clone --depth 1 https://github.com/OpenZWave/open-zwave.git && cd open-zwave && make -j8 install
+    git clone --depth 1 https://github.com/OpenZWave/open-zwave.git && cd open-zwave && make -j8 install && \
+    echo "/usr/local/lib64" >> /etc/ld.so.conf.d/openzwave.conf
 
 # Using a custom SWIG version
 # RUN wget https://downloads.sourceforge.net/project/swig/swig/swig-3.0.10/swig-3.0.10.tar.gz && \
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 48b42271..e88edcf2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -64,3 +64,8 @@ services:
     build:
       args:
         - NODE_VERSION=v5.12.0
+  node6:
+    extends: node4
+    build:
+      args:
+        - NODE_VERSION=v6.11.0