From 670376e62893fc7e81064419daba9eb9d2bc1948 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Wed, 11 Mar 2020 17:46:32 +0000
Subject: [PATCH] Rundeck requires JDK 8 - install it from AdoptOpenJDK repo

---
 Dockerfile |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c95da31..e1d2ef3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,25 @@
-FROM debian:latest
+FROM debian
 
 ENV DEBIAN_FRONTEND noninteractive
+ENV RDECK_JVM_SETTINGS "-Xmx1024m -Xms256m -XX:MaxMetaspaceSize=256m -server"
 
 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 upgrade \
-	&& apt-get -y install openssh-client default-jre-headless wget rundeck \
-	&& apt-get -y clean
+	&& apt-get -y install openssh-client wget gnupg software-properties-common \
+	&& echo "deb http://dl.bintray.com/rundeck/rundeck-deb /" \
+		> /etc/apt/sources.list.d/rundeck.list \
+	&& add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ \
+	&& cat /root/*-gpg.key | apt-key add - \
+	&& apt-get -y update \
+	&& apt-get -y install adoptopenjdk-8-hotspot rundeck \
+	&& apt-get -y clean \
+	&& rm -Rf /var/lib/apt/lists/*
 
 RUN mkdir /etc/rundeck-org \
-	&& mv /etc/rundeck/* /etc/rundeck-org/
+       && mv /etc/rundeck/* /etc/rundeck-org/
 
 ADD run.sh /
 CMD /run.sh

--
Gitblit v1.9.1