From 84c49e96e2fe4670046558f0842c8ea7475f15d0 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Thu, 15 Mar 2018 13:26:14 +0000
Subject: [PATCH] Merge branch 'master' into ansible

---
 Dockerfile |   21 ++++++++++++---------
 1 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8ebe6da..69c27bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,23 @@
-FROM debian:latest
+FROM debian:stretch
 
 ENV DEBIAN_FRONTEND noninteractive
 
 EXPOSE 4440
 
 ADD *-gpg.key /root/
-RUN echo "deb http://dl.bintray.com/rundeck/rundeck-deb /" > /etc/apt/sources.list.d/rundeck.list \
-	&& cat /root/*-gpg.key | apt-key add -
-
-RUN echo 'deb http://httpredir.debian.org/debian jessie-backports main' > \
-		/etc/apt/sources.list.d/jessie-backports.list \
-	&& apt-get -y update \
+RUN apt-get -y update \
+	&& apt-get -y install gnupg \
 	&& apt-get -y upgrade \
-	&& apt-get -y -t jessie-backports install \
+	&& 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
+		ansible git python-netaddr python3-netaddr \
+	&& 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