From aee79dab35b3bd2ee700181f2c95691da5a9c97e Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 15 Mar 2018 13:17:26 +0000
Subject: [PATCH] Upgrade from jessie to stretch

---
 Dockerfile |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c95da31..d65633a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,22 @@
-FROM debian:latest
+FROM debian:stretch
 
 ENV DEBIAN_FRONTEND noninteractive
 
 EXPOSE 4440
 
-ADD bintray-gpg.key rundeck-gpg.key /root/
-RUN echo "deb http://dl.bintray.com/rundeck/rundeck-deb /" > /etc/apt/sources.list.d/rundeck.list \
-	&& apt-key add /root/bintray-gpg.key /root/rundeck-gpg.key
-
+ADD *-gpg.key /root/
 RUN apt-get -y update \
+	&& apt-get -y install gnupg \
 	&& apt-get -y upgrade \
-	&& apt-get -y install openssh-client default-jre-headless wget rundeck \
-	&& apt-get -y clean
+	&& echo 'deb http://httpredir.debian.org/debian stretch-backports main' > \
+		/etc/apt/sources.list.d/stretch-backports.list \
+	&& echo "deb http://dl.bintray.com/rundeck/rundeck-deb /" > /etc/apt/sources.list.d/rundeck.list \
+	&& cat /root/*-gpg.key | apt-key add - \
+	&& apt-get -y update \
+	&& apt-get -y -t stretch-backports install \
+		openssh-client openjdk-8-jre-headless wget rundeck \
+	&& apt-get -y clean \
+	&& rm -Rf /var/lib/apt/lists/*
 
 RUN mkdir /etc/rundeck-org \
 	&& mv /etc/rundeck/* /etc/rundeck-org/

--
Gitblit v1.9.1