Switch to debian:stretch and python:3.6-stretch, add .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644 (file)
index 0000000..03df86d
--- /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 dda4960f77bd2d3a6473f8ad7e8706413ffb1861..8848465e091907e10682fd55bc96232411b93deb 100644 (file)
--- 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 81f776b6c5e37b71799b94f7e9fcfadb51a7b031..a86f20ab8fa18c4dad8aafe9bc25940617ad7dcf 100644 (file)
--- 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 3ee7e2448a8923f8bb13cc743a8cb51f5e3d40d0..33bfa16995b8d5563b7ad117ff4a1502c3eb2e69 100644 (file)
--- 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 (file)
index 0000000..3ee7e24
--- /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 (file)
index 0000000..33bfa16
--- /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