From a309b8b92fabe46cf0ee9e6dcf204b3053446723 Mon Sep 17 00:00:00 2001
From: Rik Veenboer <rik.veenboer@gmail.com>
Date: Mon, 25 Dec 2017 13:35:54 +0000
Subject: [PATCH] set debian version in config

---
 build/Makefile              | 6 +++++-
 build/scripts/facette.sh    | 7 +++++--
 build/scripts/ffmpeg.sh     | 2 +-
 build/scripts/multimedia.sh | 4 ++--
 build/scripts/mysql.sh      | 7 +++++--
 build/scripts/prepare.sh    | 6 +++---
 6 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/build/Makefile b/build/Makefile
index 6da70b3..c908301 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -1,4 +1,5 @@
-FROM = debian:stretch
+DEBIAN = stretch
+FROM = debian:$(DEBIAN)
 MODE = minimal
 PROXY = $(shell hostname -i)
 TIMEZONE = Europe/London
@@ -59,6 +60,9 @@ prepare:
 ifneq ($(PROXY),)
 	$(call arg,http_proxy,http://$(PROXY):3142)
 endif
+ifneq ($(DEBIAN),)
+	$(call arg,DEBIAN,$(DEBIAN))
+endif
 ifneq ($(TIMEZONE),)
 	$(call arg,TIMEZONE,$(TIMEZONE))
 endif
diff --git a/build/scripts/facette.sh b/build/scripts/facette.sh
index a388f49..ff929e7 100644
--- a/build/scripts/facette.sh
+++ b/build/scripts/facette.sh
@@ -1,8 +1,11 @@
+## Configuration
+export_env FACETTE_VERSION 0.4.0
+
 ## Dependencies
 apt_install_permanent librrd4 mime-support wget
 
 ## Facette
-wget https://github.com/facette/facette/releases/download/0.3.0/facette_0.3.0-1.jessie_amd64.deb
-dpkg -i facette_0.3.0-1.jessie_amd64.deb
+wget https://github.com/facette/facette/releases/download/$FACETTE_VERSION/facette_$FACETTE_VERSION-1.$DEBIAN_amd64.deb
+dpkg -i facette_$FACETTE_VERSION-1.$DEBIAN_amd64.deb
 mkdir -p /var/run/facette
 ln -s /usr/share/facette /usr/local/share/
diff --git a/build/scripts/ffmpeg.sh b/build/scripts/ffmpeg.sh
index edcff3e..e715c7b 100644
--- a/build/scripts/ffmpeg.sh
+++ b/build/scripts/ffmpeg.sh
@@ -8,7 +8,7 @@ export_env SDK_URL https://www.dropbox.com/s/wel0xazy2c45pqe/$SDK_BASENAME.zip
 apt_install_permanent sudo linux-libc-dev
 
 ## Cuda
-echo 'deb http://deb.debian.org/debian stretch main contrib non-free' >> /etc/apt/sources.list
+echo 'deb http://deb.debian.org/debian $DEBIAN main contrib non-free' >> /etc/apt/sources.list
 apt_install_permanent libcuda1 libnvidia-encode1
 
 ## FFmpeg
diff --git a/build/scripts/multimedia.sh b/build/scripts/multimedia.sh
index bce7105..be35046 100644
--- a/build/scripts/multimedia.sh
+++ b/build/scripts/multimedia.sh
@@ -1,4 +1,4 @@
 ## Enable multimedia sources in APT
-echo 'deb http://www.deb-multimedia.org stretch main non-free' >> /etc/apt/sources.list
-echo 'deb-src http://www.deb-multimedia.org stretch main non-free' >> /etc/apt/sources.list
+echo 'deb http://www.deb-multimedia.org $DEBIAN main non-free' >> /etc/apt/sources.list
+echo 'deb-src http://www.deb-multimedia.org $DEBIAN main non-free' >> /etc/apt/sources.list
 apt_install_permanent deb-multimedia-keyring
diff --git a/build/scripts/mysql.sh b/build/scripts/mysql.sh
index dac80b9..e7a5792 100644
--- a/build/scripts/mysql.sh
+++ b/build/scripts/mysql.sh
@@ -1,7 +1,10 @@
+## Dependencies
+apt_install_permanent procps
+
 ## MySQL
 debconf-set-selections <<< 'mariadb-server mariadb-server/root_password password dummy'
 debconf-set-selections <<< 'mariadb-server mariadbql-server/root_password_again password dummy'
-apt_install_permanent mariadb-server 
+apt_install_permanent mariadb-server
 
 ## Environment
 export_env MYSQL_CONFIG /etc/mysql/my.cnf
@@ -16,4 +19,4 @@ tee -a $MYSQL_CONFIG <<EOF
 
 [mysqld]
 skip-grant-tables
-EOF
\ No newline at end of file
+EOF
diff --git a/build/scripts/prepare.sh b/build/scripts/prepare.sh
index 2a47798..7375ffc 100644
--- a/build/scripts/prepare.sh
+++ b/build/scripts/prepare.sh
@@ -15,9 +15,9 @@ echo force-unsafe-io > /etc/dpkg/dpkg.cfg.d/02apt-speedup
 export_env INITRD no
 
 # Enable sources and backports in APT
-echo 'deb-src http://httpredir.debian.org/debian/ stretch main' >> /etc/apt/sources.list
-echo 'deb http://httpredir.debian.org/debian/ stretch-backports main contrib non-free' >> /etc/apt/sources.list
-echo 'deb-src http://httpredir.debian.org/debian/ stretch-backports main contrib non-free' >> /etc/apt/sources.list
+echo "deb-src http://deb.debian.org/debian/ $DEBIAN main" >> /etc/apt/sources.list
+echo "deb http://deb.debian.org/debian/ $DEBIAN-backports main contrib non-free" >> /etc/apt/sources.list
+echo "deb-src http://deb.debian.org/debian/ $DEBIAN-backports main contrib non-free" >> /etc/apt/sources.list
 
 ## Fix some issues with APT packages
 # See https://github.com/dotcloud/docker/issues/1024