From cf017b86c08724ee02c4089bbb3a7160cbe92016 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 03 Feb 2016 21:09:51 +0000
Subject: [PATCH] Use wildcards to load GPG keys
---
Dockerfile | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index bc052f2..acad23f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,24 +1,25 @@
FROM debian:latest
ENV DEBIAN_FRONTEND noninteractive
-ENV RUNDECK_VERSION 2.5.2-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 echo "deb http://dl.bintray.com/rundeck/rundeck-deb /" > /etc/apt/sources.list.d/rundeck.list \
+ && cat /root/*-gpg.key | apt-key add -
-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 apt-get -y update \
+ && apt-get -y upgrade \
+ && apt-get -y install openssh-client default-jre-headless wget rundeck \
+ && apt-get -y clean
-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