From 4bd7afac81dfc427f709095096732a065c144b36 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Tue, 13 Nov 2018 19:16:54 +0100
Subject: [PATCH] Switch to debian:stretch and python:3.6-stretch, add
 .dockerignore

---
 .dockerignore                |  8 ++++++++
 Dockerfile                   |  4 ++--
 docker-compose.yml           |  2 +-
 etc/apt/sources.list         | 18 ++++++++++--------
 etc/apt/sources.list.jessie  |  9 +++++++++
 etc/apt/sources.list.stretch | 11 +++++++++++
 6 files changed, 41 insertions(+), 11 deletions(-)
 create mode 100644 .dockerignore
 create mode 100644 etc/apt/sources.list.jessie
 create mode 100644 etc/apt/sources.list.stretch

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..03df86da
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+.git
+*.pyc
+*.egg-info
+data/
+env/
+tmp/
+var/
+**/.sass-cache
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index dda4960f..8848465e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3-jessie
+FROM python:3.6-stretch
 
 ENV PYTHONUNBUFFERED 1
 
@@ -10,7 +10,7 @@ COPY etc/apt/preferences.d/nodejs /etc/apt/preferences.d/
 COPY requirements.txt /srv
 RUN apt-get update && \
     DEBIAN_PACKAGES=$(egrep -v "^\s*(#|$)" /srv/requirements.txt) && \
-    apt-get install -t jessie-backports -y --force-yes $DEBIAN_PACKAGES && \
+    apt-get install -t stretch-backports -y --force-yes $DEBIAN_PACKAGES && \
     echo fr_FR.UTF-8 UTF-8 >> /etc/locale.gen && \
     locale-gen && \
     apt-get clean
diff --git a/docker-compose.yml b/docker-compose.yml
index 81f776b6..a86f20ab 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -21,7 +21,7 @@
 version: '2'
 services:
     var:
-        image: debian:jessie
+        image: debian:stretch
         volumes:
             - ./var/media:/srv/media
             - ./var/backup:/srv/backup
diff --git a/etc/apt/sources.list b/etc/apt/sources.list
index 3ee7e244..33bfa169 100644
--- a/etc/apt/sources.list
+++ b/etc/apt/sources.list
@@ -1,9 +1,11 @@
-deb http://httpredir.debian.org/debian jessie main contrib non-free
-deb http://security.debian.org/ jessie/updates main
-deb http://httpredir.debian.org/debian jessie-updates main
-deb http://httpredir.debian.org/debian jessie-backports main contrib non-free
-deb https://deb.nodesource.com/node_10.x jessie main
+deb http://httpredir.debian.org/debian stretch main contrib non-free
+deb http://httpredir.debian.org/debian stretch-updates main
+deb http://httpredir.debian.org/debian stretch-backports main contrib non-free
 
-#deb http://mirrors.ircam.fr/pub/debian/ jessie main contrib non-free
-#deb http://mirrors.ircam.fr/pub/debian/ jessie-updates main
-#deb http://mirrors.ircam.fr/pub/debian/ jessie-backports main contrib non-free
+deb http://security.debian.org/ stretch/updates main
+
+deb https://deb.nodesource.com/node_10.x stretch main
+
+#deb http://mirrors.ircam.fr/pub/debian/ stretch main contrib non-free
+#deb http://mirrors.ircam.fr/pub/debian/ stretch-updates main
+#deb http://mirrors.ircam.fr/pub/debian/ stretch-backports main contrib non-free
diff --git a/etc/apt/sources.list.jessie b/etc/apt/sources.list.jessie
new file mode 100644
index 00000000..3ee7e244
--- /dev/null
+++ b/etc/apt/sources.list.jessie
@@ -0,0 +1,9 @@
+deb http://httpredir.debian.org/debian jessie main contrib non-free
+deb http://security.debian.org/ jessie/updates main
+deb http://httpredir.debian.org/debian jessie-updates main
+deb http://httpredir.debian.org/debian jessie-backports main contrib non-free
+deb https://deb.nodesource.com/node_10.x jessie main
+
+#deb http://mirrors.ircam.fr/pub/debian/ jessie main contrib non-free
+#deb http://mirrors.ircam.fr/pub/debian/ jessie-updates main
+#deb http://mirrors.ircam.fr/pub/debian/ jessie-backports main contrib non-free
diff --git a/etc/apt/sources.list.stretch b/etc/apt/sources.list.stretch
new file mode 100644
index 00000000..33bfa169
--- /dev/null
+++ b/etc/apt/sources.list.stretch
@@ -0,0 +1,11 @@
+deb http://httpredir.debian.org/debian stretch main contrib non-free
+deb http://httpredir.debian.org/debian stretch-updates main
+deb http://httpredir.debian.org/debian stretch-backports main contrib non-free
+
+deb http://security.debian.org/ stretch/updates main
+
+deb https://deb.nodesource.com/node_10.x stretch main
+
+#deb http://mirrors.ircam.fr/pub/debian/ stretch main contrib non-free
+#deb http://mirrors.ircam.fr/pub/debian/ stretch-updates main
+#deb http://mirrors.ircam.fr/pub/debian/ stretch-backports main contrib non-free
-- 
2.39.5