diff --git a/linux-amd64.Dockerfile b/linux-amd64.Dockerfile index afb0175c7..ae530f21f 100644 --- a/linux-amd64.Dockerfile +++ b/linux-amd64.Dockerfile @@ -6,7 +6,7 @@ EXPOSE 6789 ARG IMAGE_STATS ENV IMAGE_STATS=${IMAGE_STATS} WEBUI_PORTS="6789/tcp,6789/udp" -RUN apk add --no-cache python3 py3-lxml +RUN apk add --no-cache py3-lxml # install app ARG VERSION @@ -14,7 +14,7 @@ RUN runfile="/tmp/app.run" && \ curl -fsSL -o "${runfile}" "https://github.com/nzbgetcom/nzbget/releases/download/v${VERSION}/nzbget-${VERSION}-bin-linux.run" && \ sh "${runfile}" --destdir "${APP_DIR}" && \ rm "${runfile}" && \ - curl -fsSL "https://curl.se/ca/cacert.pem" | sed '/^DST Root CA X3$/,/^-----END CERTIFICATE-----$/d;' > "${APP_DIR}/cacert.pem" && \ + rm -rf "${APP_DIR}/unrar" "${APP_DIR}/7za" && \ chmod -R u=rwX,go=rX "${APP_DIR}" && \ chown -R root:root "${APP_DIR}" diff --git a/linux-arm64.Dockerfile b/linux-arm64.Dockerfile index dd6f70b22..5d1d43c7e 100644 --- a/linux-arm64.Dockerfile +++ b/linux-arm64.Dockerfile @@ -6,7 +6,7 @@ EXPOSE 6789 ARG IMAGE_STATS ENV IMAGE_STATS=${IMAGE_STATS} WEBUI_PORTS="6789/tcp,6789/udp" -RUN apk add --no-cache python3 py3-lxml +RUN apk add --no-cache py3-lxml # install app ARG VERSION @@ -14,7 +14,7 @@ RUN runfile="/tmp/app.run" && \ curl -fsSL -o "${runfile}" "https://github.com/nzbgetcom/nzbget/releases/download/v${VERSION}/nzbget-${VERSION}-bin-linux.run" && \ sh "${runfile}" --destdir "${APP_DIR}" && \ rm "${runfile}" && \ - curl -fsSL "https://curl.se/ca/cacert.pem" | sed '/^DST Root CA X3$/,/^-----END CERTIFICATE-----$/d;' > "${APP_DIR}/cacert.pem" && \ + rm -rf "${APP_DIR}/unrar" "${APP_DIR}/7za" && \ chmod -R u=rwX,go=rX "${APP_DIR}" && \ chown -R root:root "${APP_DIR}" diff --git a/root/etc/s6-overlay/s6-rc.d/init-setup-app/run b/root/etc/s6-overlay/s6-rc.d/init-setup-app/run index 36a7685f4..5829fa2f3 100644 --- a/root/etc/s6-overlay/s6-rc.d/init-setup-app/run +++ b/root/etc/s6-overlay/s6-rc.d/init-setup-app/run @@ -18,6 +18,8 @@ if [[ ! -f "${CONFIG_DIR}/nzbget.conf" ]]; then -e "s#\\(LockFile=\\).*#\\1${CONFIG_DIR}/nzbget.lock#g" \ -e "s#\\(LogFile=\\).*#\\1${CONFIG_DIR}/nzbget.log#g" \ -e "s#\\(ShellOverride=\\).*#\\1.py=/usr/bin/python3#g" \ + -e "s#\\(UnrarCmd=\\).*#\\1unrar#g" \ + -e "s#\\(SevenZipCmd=\\).*#\\17z#g" \ "${APP_DIR}/nzbget.conf" > "${CONFIG_DIR}/nzbget.conf" chown hotio:hotio "${CONFIG_DIR}/nzbget.conf" fi