From 29f0ebaa0fda00a5a5f4487cef7bccaeb246665a Mon Sep 17 00:00:00 2001 From: Simon Baier Date: Wed, 27 Jun 2018 22:30:52 +0200 Subject: [PATCH 1/4] adjust to upstream codebase --- Dockerfile | 7 ++++--- startJD2.sh | 15 +-------------- 2 files changed, 5 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 296c237..e0d922d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -FROM openjdk:8-jre +FROM openjdk:8-jre-alpine MAINTAINER PlusMinus -# Create directory, downloader JD" and start JD2 for the initial update and creation of config files. +# Create directory, and start JD2 for the initial update and creation of config files. RUN \ mkdir -p /opt/JDownloader/ && \ wget -O /opt/JDownloader/JDownloader.jar --user-agent="https://hub.docker.com/r/plusminus/jdownloader2-headless/" --progress=bar:force http://installer.jdownloader.org/JDownloader.jar && \ @@ -14,5 +14,6 @@ COPY startJD2.sh /opt/JDownloader/ RUN chmod +x /opt/JDownloader/startJD2.sh +ENTRYPOINT ["/sbin/tini", "-g", "--", "/opt/JDownloader/startJD2.sh"] # Run this when the container is started -CMD /opt/JDownloader/startJD2.sh +CMD ["java", "-Djava.awt.headless=true", "-jar", "/opt/JDownloader/JDownloader.jar"] diff --git a/startJD2.sh b/startJD2.sh index 6e68d88..4bf2192 100755 --- a/startJD2.sh +++ b/startJD2.sh @@ -1,12 +1,5 @@ #!/bin/bash -function stopJD2 { - PID=$(cat JDownloader.pid) - kill $PID - wait $PID - exit -} - if [ "$GID" ] && [ "$GID" -ne "0" ] then GROUP=jdownloader @@ -26,11 +19,5 @@ fi useradd -G $GROUP $USER chown -R $USER:$GROUP /opt/JDownloader -trap stopJD2 EXIT - -su -c "java -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar &" -s /bin/bash $USER - -while true; do - sleep inf -done +exec su-exec "$@" From 8461de8fe8c68bdc03803dfa817b68168952a74d Mon Sep 17 00:00:00 2001 From: Simon Baier Date: Wed, 27 Jun 2018 22:39:09 +0200 Subject: [PATCH 2/4] add packages --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index e0d922d..af69325 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,6 +5,7 @@ MAINTAINER PlusMinus # Create directory, and start JD2 for the initial update and creation of config files. RUN \ + apk add --no-cache --quiet tini su-exec bash && \ mkdir -p /opt/JDownloader/ && \ wget -O /opt/JDownloader/JDownloader.jar --user-agent="https://hub.docker.com/r/plusminus/jdownloader2-headless/" --progress=bar:force http://installer.jdownloader.org/JDownloader.jar && \ java -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar From 70a542ea17c8b3054fd9f0dea065286f55f649df Mon Sep 17 00:00:00 2001 From: Simon Baier Date: Wed, 27 Jun 2018 22:40:05 +0200 Subject: [PATCH 3/4] remove progress bar arg --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index af69325..f9d98d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ MAINTAINER PlusMinus RUN \ apk add --no-cache --quiet tini su-exec bash && \ mkdir -p /opt/JDownloader/ && \ - wget -O /opt/JDownloader/JDownloader.jar --user-agent="https://hub.docker.com/r/plusminus/jdownloader2-headless/" --progress=bar:force http://installer.jdownloader.org/JDownloader.jar && \ + wget -O /opt/JDownloader/JDownloader.jar --user-agent="https://hub.docker.com/r/plusminus/jdownloader2-headless/" http://installer.jdownloader.org/JDownloader.jar && \ java -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar From 1975ef4c5a2e6966e38eea59b2c95d345ee00303 Mon Sep 17 00:00:00 2001 From: Simon Baier Date: Wed, 27 Jun 2018 23:05:12 +0200 Subject: [PATCH 4/4] add su user specifier --- startJD2.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/startJD2.sh b/startJD2.sh index 4bf2192..17bdfdd 100755 --- a/startJD2.sh +++ b/startJD2.sh @@ -19,5 +19,5 @@ fi useradd -G $GROUP $USER chown -R $USER:$GROUP /opt/JDownloader -exec su-exec "$@" +exec su-exec ${USER}:${GROUP} "$@"