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 | 27 +++++++++++++++++----------
1 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index d72d757..69c27bc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,31 @@
-FROM debian:latest
+FROM debian:stretch
ENV DEBIAN_FRONTEND noninteractive
-ENV RUNDECK_VERSION 2.6.1-1-GA
EXPOSE 4440
-RUN apt-get -y update && apt-get -y upgrade
-RUN apt-get -y install openssh-client default-jre-headless
+ADD *-gpg.key /root/
+RUN apt-get -y update \
+ && apt-get -y install gnupg \
+ && apt-get -y upgrade \
+ && 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 \
+ ansible git python-netaddr python3-netaddr \
+ && apt-get -y clean \
+ && rm -Rf /var/lib/apt/lists/*
-RUN apt-get -y install wget
-RUN wget -O /tmp/rundeck.deb http://download.rundeck.org/deb/rundeck-${RUNDECK_VERSION}.deb
-RUN dpkg -i /tmp/rundeck.deb && rm -f /tmp/rundeck.deb
-
-RUN mkdir /etc/rundeck-org && mv /etc/rundeck/* /etc/rundeck-org/
+RUN mkdir /etc/rundeck-org \
+ && mv /etc/rundeck/* /etc/rundeck-org/
ADD run.sh /
CMD /run.sh
VOLUME /etc/rundeck
VOLUME /var/lib/rundeck/data
-VOLUME /var/lib/rundeck/var
VOLUME /var/lib/rundeck/logs
VOLUME /var/rundeck
--
Gitblit v1.9.1