docker-multiarch/jdownloader2-headless
1
0
Fork 0
mirror of https://git.netzspielplatz.de/docker-multiarch/jdownloader2-headless.git synced 2025-11-08 20:39:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from sbaier1/upstream_master

Browse source 
improve signal handling, alpine
This commit is contained in:
PlusMinus0 2018-06-28 16:25:31 +02:00 • committed by GitHub
commit 5393866642
2 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile
View file

@ -1,12 +1,13 @@
FROM openjdk:8-jre FROM openjdk:8-jre-alpine
MAINTAINER PlusMinus <piddlpiddl@gmail.com> MAINTAINER PlusMinus <piddlpiddl@gmail.com>
# 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 \ RUN \
apk add --no-cache --quiet tini su-exec bash && \
mkdir -p /opt/JDownloader/ && \ 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 java -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar
@ -14,5 +15,6 @@ COPY startJD2.sh /opt/JDownloader/
RUN chmod +x /opt/JDownloader/startJD2.sh RUN chmod +x /opt/JDownloader/startJD2.sh
ENTRYPOINT ["/sbin/tini", "-g", "--", "/opt/JDownloader/startJD2.sh"]
# Run this when the container is started # Run this when the container is started
CMD /opt/JDownloader/startJD2.sh CMD ["java", "-Djava.awt.headless=true", "-jar", "/opt/JDownloader/JDownloader.jar"]

15
startJD2.sh
View file

@ -1,12 +1,5 @@
#!/bin/bash #!/bin/bash
function stopJD2 {
PID=$(cat JDownloader.pid)
kill $PID
wait $PID
exit
}
if [ "$GID" ] && [ "$GID" -ne "0" ] if [ "$GID" ] && [ "$GID" -ne "0" ]
then then
GROUP=jdownloader GROUP=jdownloader
@ -26,11 +19,5 @@ fi
useradd -G $GROUP $USER useradd -G $GROUP $USER
chown -R $USER:$GROUP /opt/JDownloader chown -R $USER:$GROUP /opt/JDownloader
trap stopJD2 EXIT exec su-exec ${USER}:${GROUP} "$@"
su -c "java -Djava.awt.headless=true -jar /opt/JDownloader/JDownloader.jar &" -s /bin/bash $USER
while true; do
sleep inf
done