haeaeae/docker-nzbhydra2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorganize container

Browse Source 
Relocate app to /app/nzbhydra2/bin
Create /app/nzbhydra2/package_info
Use nzbhydra2wrapperPy3.py from zip
This commit is contained in:
Eric Nemchik
2020-05-01 10:31:27 -05:00
parent c7479aed48
commit 9e8f53fe75
7 changed files with 19 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Dockerfile
+5 -6
View File
@@ -9,6 +9,7 @@ LABEL maintainer="aptalca,nemchik"
# environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
RUN \
echo "**** install packages ****" && \
@@ -29,12 +30,10 @@ RUN \
curl -o \
/tmp/nzbhydra2.zip -L \
"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
mkdir -p /app/nzbhydra2 && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
curl -o \
/app/nzbhydra2/nzbhydra2wrapperPy3.py -L \
"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
mkdir -p /app/nzbhydra2/bin && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
echo "UpdateMethod=docker\nReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/* \
Dockerfile.aarch64
+5 -6
View File
@@ -9,6 +9,7 @@ LABEL maintainer="aptalca,nemchik"
# environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
RUN \
echo "**** install packages ****" && \
@@ -29,12 +30,10 @@ RUN \
curl -o \
/tmp/nzbhydra2.zip -L \
"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
mkdir -p /app/nzbhydra2 && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
curl -o \
/app/nzbhydra2/nzbhydra2wrapperPy3.py -L \
"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
mkdir -p /app/nzbhydra2/bin && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
echo "UpdateMethod=docker\nReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/* \
Dockerfile.armhf
+5 -6
View File
@@ -9,6 +9,7 @@ LABEL maintainer="aptalca,nemchik"
# environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
RUN \
echo "**** install packages ****" && \
@@ -29,12 +30,10 @@ RUN \
curl -o \
/tmp/nzbhydra2.zip -L \
"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
mkdir -p /app/nzbhydra2 && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
curl -o \
/app/nzbhydra2/nzbhydra2wrapperPy3.py -L \
"https://raw.githubusercontent.com/theotherp/nzbhydra2/master/other/wrapper/nzbhydra2wrapperPy3.py" && \
chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
mkdir -p /app/nzbhydra2/bin && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
echo "UpdateMethod=docker\nReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
echo "**** cleanup ****" && \
rm -rf \
/tmp/* \
README.md
+1
View File
@@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **01.05.20:** - Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip.
* **29.04.20:** - Include stable releases incrementally with dev releases.
* **14.04.20:** - Correct Name, Hydra2 -> Nzbhydra2.
* **08.01.20:** - Switch to python3.
readme-vars.yml
+1
View File
@@ -56,6 +56,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "01.05.20:", desc: "Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip." }
- { date: "29.04.20:", desc: "Include stable releases incrementally with dev releases." }
- { date: "14.04.20:", desc: "Correct Name, Hydra2 -> Nzbhydra2." }
- { date: "08.01.20:", desc: "Switch to python3." }
root/etc/cont-init.d/30-config
+1 -1
View File
@@ -5,5 +5,5 @@ mkdir -p /config/logs
# permissions
chmod +x /app/nzbhydra2/nzbhydra2
chmod +x /app/nzbhydra2/bin/nzbhydra2
chown -R abc:abc /config
root/etc/services.d/nzbhydra2/run
+1 -1
View File
@@ -3,7 +3,7 @@
# unset unraid specific ENV to avoid crashing
unset HOST_OS
cd /app/nzbhydra2 || exit
cd /app/nzbhydra2/bin || exit
exec \
s6-setuidgid abc /usr/bin/python3 nzbhydra2wrapperPy3.py \