From 35573993366297d86198c1639be0f23aceb2be39 Mon Sep 17 00:00:00 2001
From: Matthias Volk <matthias.volk@cs.rwth-aachen.de>
Date: Wed, 10 May 2017 18:17:00 +0200
Subject: [PATCH] Support for Debian 9

---
 .travis.yml                                |  9 +++++++++
 travis/dockerfiles/Dockerfile.debian-9     | 14 ++++++++++++++
 travis/dockerfiles/Dockerfile.ubuntu-16.10 | 15 ++++++++++++---
 travis/dockerfiles/build_docker.sh         |  6 ++++++
 travis/dockerfiles/common_install.sh       | 18 ------------------
 5 files changed, 41 insertions(+), 21 deletions(-)
 create mode 100644 travis/dockerfiles/Dockerfile.debian-9
 delete mode 100644 travis/dockerfiles/common_install.sh

diff --git a/.travis.yml b/.travis.yml
index c40bc9a13..31a22cf9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,15 @@ matrix:
       travis/postsubmit.sh DebugPlain
     before_cache:
       docker cp storm:/storm/. .
+  - compiler: gcc
+    env: COMPILER=gcc-6 LINUX=debian-9 TEST=DebugPlain
+    install: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+      travis/install_linux.sh
+    os: linux
+    script: export OS=linux; export COMPILER='gcc-6'; export LINUX='debian-9';
+      travis/postsubmit.sh DebugPlain
+    before_cache:
+      docker cp storm:/storm/. .
 #  - compiler: gcc
 #    env: COMPILER=gcc-6 UBUNTU=17.04 TEST=DebugPlain
 #    install: export OS=linux; export COMPILER='gcc-6'; export UBUNTU='17.04'; extras/scripts/travis_ci_install_linux.sh
diff --git a/travis/dockerfiles/Dockerfile.debian-9 b/travis/dockerfiles/Dockerfile.debian-9
new file mode 100644
index 000000000..2a2c7989c
--- /dev/null
+++ b/travis/dockerfiles/Dockerfile.debian-9
@@ -0,0 +1,14 @@
+FROM debian:9
+MAINTAINER Matthias Volk <matthias.volk@cs.rwth-aachen.de>
+
+RUN apt-get update -qq && apt-get install -y --no-install-recommends \
+    build-essential \
+    ruby \
+    git \
+    cmake \
+    libboost-all-dev \
+    libcln-dev \
+    libgmp-dev \
+    libginac-dev \
+    automake \
+    libglpk-dev
diff --git a/travis/dockerfiles/Dockerfile.ubuntu-16.10 b/travis/dockerfiles/Dockerfile.ubuntu-16.10
index 94e5bb5dd..541f8b64c 100644
--- a/travis/dockerfiles/Dockerfile.ubuntu-16.10
+++ b/travis/dockerfiles/Dockerfile.ubuntu-16.10
@@ -1,6 +1,15 @@
 FROM ubuntu:16.10
 MAINTAINER Matthias Volk <matthias.volk@cs.rwth-aachen.de>
 
-COPY common_install.sh /
-
-RUN bash -x /common_install.sh
+RUN apt-get update -qq && apt-get install -y --no-install-recommends \
+    build-essential \
+    ruby \
+    git \
+    cmake \
+    libboost-all-dev \
+    libcln-dev \
+    libgmp-dev \
+    libginac-dev \
+    automake \
+    libglpk-dev \
+    libhwloc-dev
diff --git a/travis/dockerfiles/build_docker.sh b/travis/dockerfiles/build_docker.sh
index a02680a0c..280710566 100755
--- a/travis/dockerfiles/build_docker.sh
+++ b/travis/dockerfiles/build_docker.sh
@@ -1,3 +1,9 @@
 #!/bin/bash
+
+# Build Ubuntu 16.10 "Yakkety Yak"
 docker build -t mvolk/storm-basesystem:ubuntu-16.10 -f Dockerfile.ubuntu-16.10 .
 docker push mvolk/storm-basesystem:ubuntu-16.10
+
+# Build Debian 9 "Stretch"
+docker build -t mvolk/storm-basesystem:debian-9 -f Dockerfile.debian-9 .
+docker push mvolk/storm-basesystem:debian-9
diff --git a/travis/dockerfiles/common_install.sh b/travis/dockerfiles/common_install.sh
deleted file mode 100644
index 9a40c7168..000000000
--- a/travis/dockerfiles/common_install.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-# Install dependencies
-
-set -e
-
-apt-get update -qq
-apt-get install -y --no-install-recommends \
-    build-essential \
-    ruby \
-    git \
-    cmake \
-    libboost-all-dev \
-    libcln-dev \
-    libgmp-dev \
-    libginac-dev \
-    automake \
-    libglpk-dev \
-    libhwloc-dev