diff --git a/Dockerfile b/Dockerfile index 660094a..ef939dc 100755 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ COPY qemu-arm-static /usr/bin/ FROM builder ARG ARCH=armhf -ARG VERSION="0.5.1" +ARG VERSION="0.6.0" LABEL maintainer="Jay MOULIN " LABEL version="${VERSION}" @@ -14,11 +14,13 @@ 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 wget --virtual .build-deps && \ + apk add --update libstdc++ ffmpeg && \ + 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 && \ + 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 ENV LD_LIBRARY_PATH=/lib;/lib32;/usr/lib @@ -27,8 +29,6 @@ COPY daemon.sh /opt/JDownloader/ COPY default-config.json.dist /opt/JDownloader/org.jdownloader.api.myjdownloader.MyJDownloaderSettings.json.dist COPY configure.sh /usr/bin/configure -VOLUME /root/Downloads -VOLUME /opt/JDownloader/cfg WORKDIR /opt/JDownloader CMD ["tini", "--", "/opt/JDownloader/daemon.sh"] diff --git a/Makefile b/Makefile index 0dda7a2..2e58948 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION ?= 0.5.1 +VERSION ?= 0.6.0 CACHE ?= --no-cache=1 FULLVERSION ?= ${VERSION} archs ?= amd64 arm32v6 arm64v8 i386 diff --git a/README.md b/README.md index 443a27b..2655ee5 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Installation --- ``` -docker run -d --restart=always -v ~/Downloads:/root/Downloads -v ~/jdownloader/cfg:/opt/JDownloader/cfg --name jdownloader jaymoulin/jdownloader +docker run -d --restart=always -v ~/Downloads:/root/Downloads -v ~/jdownloader/cfg:/opt/JDownloader/cfg --name jdownloader -u $UID:$(id -g) jaymoulin/jdownloader ``` You can replace `~/Downloads` with the folder you want your downloaded files to go.