From bea7e84452ff72a3736e159eb91943014ce80de6 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 11 Mar 2020 16:54:30 +0000
Subject: [PATCH] Base on jacekkow/rundeck, get rid of stretch-backports

---
 Dockerfile |   34 +----------------
 /dev/null  |   57 ----------------------------
 2 files changed, 2 insertions(+), 89 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index da4ebd3..7dc66d1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,38 +1,8 @@
-FROM openjdk:8-jre-slim-stretch
+FROM jacekkow/rundeck
 
-ENV DEBIAN_FRONTEND noninteractive
-ENV RDECK_JVM_SETTINGS "-Xmx1024m -Xms256m -XX:MaxMetaspaceSize=256m -server"
-
-EXPOSE 4440
-
-ADD *-gpg.key /root/
 RUN apt-get -y update \
 	&& apt-get -y upgrade \
-	&& apt-get -y install openssh-client wget gnupg \
-	&& 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 install rundeck \
-	&& apt-get -y clean \
-	&& rm -Rf /var/lib/apt/lists/*
-
-RUN echo "deb http://ftp.debian.org/debian stretch-backports main" \
-		> /etc/apt/sources.list.d/backports.list \
-	&& apt-get -y update \
-	&& apt-get -y upgrade \
-	&& apt-get -y -t stretch-backports install \
+	&& apt-get -y install \
 		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/
-
-ADD run.sh /
-CMD /run.sh
-
-VOLUME /etc/rundeck
-VOLUME /var/lib/rundeck/data
-VOLUME /var/lib/rundeck/logs
-VOLUME /var/rundeck
diff --git a/bintray-gpg.key b/bintray-gpg.key
deleted file mode 100644
index 801368f..0000000
--- a/bintray-gpg.key
+++ /dev/null
@@ -1,52 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-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
-JESa2SNRfw==
-=EI0Z
------END PGP PUBLIC KEY BLOCK-----
diff --git a/run.sh b/run.sh
deleted file mode 100755
index 52e0f8c..0000000
--- a/run.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-if [ ! -f /etc/rundeck/profile ]; then
-	cp -Rfp /etc/rundeck-org/* /etc/rundeck/
-fi
-
-# Rundeck 3.0 - new property
-if ! grep -q -e "^rundeck.log4j.config.file" /etc/rundeck/rundeck-config.properties; then
-	echo "rundeck.log4j.config.file = /etc/rundeck/log4j.properties" \
-		>> /etc/rundeck/rundeck-config.properties
-fi
-
-# Rundeck 2.7, 3.0 - new profile
-cp -fp /etc/rundeck-org/profile /etc/rundeck/profile
-
-chown -Rf rundeck:rundeck /etc/rundeck /var/rundeck /var/lib/rundeck
-chmod -Rf o-rwx /etc/rundeck /var/rundeck /var/lib/rundeck
-
-chown -Rf :adm /var/lib/rundeck/logs
-chmod g+s,o+x /var/lib/rundeck/logs
-
-. /etc/rundeck/profile
-
-su rundeck -s /bin/bash -c "$rundeckd"
diff --git a/rundeck-gpg.key b/rundeck-gpg.key
deleted file mode 100644
index cfeef2d..0000000
--- a/rundeck-gpg.key
+++ /dev/null
@@ -1,57 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-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
-=lg8S
------END PGP PUBLIC KEY BLOCK-----

--
Gitblit v1.9.1