Skip to content

Commit

Permalink
fixes #26 - install tini from apk
Browse files Browse the repository at this point in the history
  • Loading branch information
jaymoulin committed May 26, 2019
1 parent 01c09f9 commit b643822
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 10 deletions.
8 changes: 3 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,18 @@ COPY qemu-arm-static /usr/bin/
FROM builder

ARG ARCH=armhf
ARG VERSION="0.7.0"
ARG VERSION="0.7.1"
LABEL maintainer="Jay MOULIN <[email protected]> <https://twitter.com/MoulinJay>"
LABEL version="${VERSION}-${ARCH}"

COPY ./${ARCH}/*.jar /opt/JDownloader/libs/
# archive extraction uses sevenzipjbinding library
# which is compiled against libstdc++
RUN mkdir -p /opt/JDownloader/ && \
apk add --update libstdc++ ffmpeg && \
apk add --update libstdc++ ffmpeg tini-static && \
apk add wget --virtual .build-deps && \
wget -O /opt/JDownloader/JDownloader.jar "http://installer.jdownloader.org/JDownloader.jar?$RANDOM" && \
chmod +x /opt/JDownloader/JDownloader.jar && \
wget -O /usr/bin/tini "https://github.com/krallin/tini/releases/download/v0.18.0/tini-static-${ARCH}" --no-check-certificate && \
chmod +x /usr/bin/tini && \
chmod 777 /opt/JDownloader/ -R && \
apk del wget --purge .build-deps && \
rm /usr/bin/qemu-*-static
Expand All @@ -31,4 +29,4 @@ COPY configure.sh /usr/bin/configure

WORKDIR /opt/JDownloader

CMD ["tini", "--", "/opt/JDownloader/daemon.sh"]
CMD ["tini-static", "--", "/opt/JDownloader/daemon.sh"]
8 changes: 4 additions & 4 deletions Dockerfile.arm32v6
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ COPY qemu-arm-static /usr/bin/
FROM builder

ARG ARCH=armel
ARG VERSION="0.7.0"
ARG VERSION="0.7.1"
LABEL maintainer="Jay MOULIN <[email protected]> <https://twitter.com/MoulinJay>"
LABEL version="${VERSION}-${ARCH}"

Expand All @@ -17,8 +17,8 @@ RUN mkdir -p /opt/JDownloader/ && \
apt install openjdk-8-jre ffmpeg wget -y && \
wget -O /opt/JDownloader/JDownloader.jar "http://installer.jdownloader.org/JDownloader.jar?$RANDOM" && \
chmod +x /opt/JDownloader/JDownloader.jar && \
wget -O /usr/bin/tini "https://github.com/krallin/tini/releases/download/v0.18.0/tini-static-${ARCH}" --no-check-certificate && \
chmod +x /usr/bin/tini && \
wget -O /usr/bin/tini-static "https://github.com/krallin/tini/releases/download/v0.18.0/tini-static-${ARCH}" --no-check-certificate && \
chmod +x /usr/bin/tini-static && \
chmod 777 /opt/JDownloader/ -R && \
apt autoremove -y wget && \
rm /usr/bin/qemu-*-static
Expand All @@ -30,4 +30,4 @@ COPY configure.sh /usr/bin/configure

WORKDIR /opt/JDownloader

CMD ["tini", "--", "/opt/JDownloader/daemon.sh"]
CMD ["tini-static", "--", "/opt/JDownloader/daemon.sh"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION ?= 0.7.0
VERSION ?= 0.7.1
CACHE ?= --no-cache=1
FULLVERSION ?= ${VERSION}
archs ?= amd64 arm32v6 armhf arm64v8 i386
Expand Down

0 comments on commit b643822

Please sign in to comment.