Rebase to Jammy

This commit is contained in:
TheSpad
2022-05-03 13:36:22 +01:00
parent da5b2c50fd
commit cd2552ce2a
7 changed files with 46 additions and 56 deletions
+14 -18
View File
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:3.15
FROM ghcr.io/linuxserver/baseimage-ubuntu:jammy
# set version label
ARG BUILD_DATE
@@ -8,40 +8,36 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="nemchik"
# environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ENV NZBHYDRA2_RELEASE_TYPE="Release"
RUN \
echo "**** install packages ****" && \
apk add -U --no-cache --virtual=build-dependencies \
unzip && \
apk add -U --no-cache \
apt-get update && \
apt-get install --no-install-recommends -y \
curl \
jq \
openjdk11-jre-headless \
python3 && \
openjdk-11-jre-headless \
python3 \
unzip && \
echo "**** install nzbhydra2 ****" && \
if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \
| jq -r .tag_name); \
NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \
| jq -r .tag_name); \
fi && \
NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
curl -o \
/tmp/nzbhydra2.zip -L \
/tmp/nzbhydra2.zip -L \
"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
mkdir -p /app/nzbhydra2/bin && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
rm -rf \
/app/nzbhydra2/bin/upstart/ \
/app/nzbhydra2/bin/rc.d/ \
/app/nzbhydra2/bin/sysv/ \
/app/nzbhydra2/bin/systemd/ && \
chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
echo -e "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/*
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
# copy local files
COPY root/ /
+14 -18
View File
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm64v8-jammy
# set version label
ARG BUILD_DATE
@@ -8,40 +8,36 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="nemchik"
# environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ENV NZBHYDRA2_RELEASE_TYPE="Release"
RUN \
echo "**** install packages ****" && \
apk add -U --no-cache --virtual=build-dependencies \
unzip && \
apk add -U --no-cache \
apt-get update && \
apt-get install --no-install-recommends -y \
curl \
jq \
openjdk11-jre-headless \
python3 && \
openjdk-11-jre-headless \
python3 \
unzip && \
echo "**** install nzbhydra2 ****" && \
if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \
| jq -r .tag_name); \
NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \
| jq -r .tag_name); \
fi && \
NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
curl -o \
/tmp/nzbhydra2.zip -L \
/tmp/nzbhydra2.zip -L \
"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
mkdir -p /app/nzbhydra2/bin && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
rm -rf \
/app/nzbhydra2/bin/upstart/ \
/app/nzbhydra2/bin/rc.d/ \
/app/nzbhydra2/bin/sysv/ \
/app/nzbhydra2/bin/systemd/ && \
chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
echo -e "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/*
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
# copy local files
COPY root/ /
+14 -18
View File
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
# set version label
ARG BUILD_DATE
@@ -8,40 +8,36 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
LABEL maintainer="nemchik"
# environment settings
ARG DEBIAN_FRONTEND="noninteractive"
ENV NZBHYDRA2_RELEASE_TYPE="Release"
RUN \
echo "**** install packages ****" && \
apk add -U --no-cache --virtual=build-dependencies \
unzip && \
apk add -U --no-cache \
apt-get update && \
apt-get install --no-install-recommends -y \
curl \
jq \
openjdk8-jre \
python3 && \
openjdk-11-jre-headless \
python3 \
unzip && \
echo "**** install nzbhydra2 ****" && \
if [ -z ${NZBHYDRA2_RELEASE+x} ]; then \
NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \
| jq -r .tag_name); \
NZBHYDRA2_RELEASE=$(curl -sX GET "https://api.github.com/repos/theotherp/nzbhydra2/releases/latest" \
| jq -r .tag_name); \
fi && \
NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
curl -o \
/tmp/nzbhydra2.zip -L \
/tmp/nzbhydra2.zip -L \
"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-linux.zip" && \
mkdir -p /app/nzbhydra2/bin && \
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2/bin && \
rm -rf \
/app/nzbhydra2/bin/upstart/ \
/app/nzbhydra2/bin/rc.d/ \
/app/nzbhydra2/bin/sysv/ \
/app/nzbhydra2/bin/systemd/ && \
chmod +x /app/nzbhydra2/bin/nzbhydra2wrapperPy3.py && \
echo -e "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
echo "**** cleanup ****" && \
apk del --purge \
build-dependencies && \
rm -rf \
/tmp/*
/tmp/* \
/var/lib/apt/lists/* \
/var/tmp/*
# copy local files
COPY root/ /
Vendored
+1 -1
View File
@@ -27,7 +27,7 @@ pipeline {
DOCKERHUB_IMAGE = 'linuxserver/nzbhydra2'
DEV_DOCKERHUB_IMAGE = 'lsiodev/nzbhydra2'
PR_DOCKERHUB_IMAGE = 'lspipepr/nzbhydra2'
DIST_IMAGE = 'alpine'
DIST_IMAGE = 'ubuntu'
MULTIARCH='true'
CI='true'
CI_WEB='true'
+1
View File
@@ -235,6 +235,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
## Versions
* **03.05.22:** - Rebase to Jammy.
* **18.04.22:** - Rebase to Alpine 3.15.
* **01.05.20:** - Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip.
* **14.04.20:** - Correct Name, Hydra2 -> NZBHydra2.
+1 -1
View File
@@ -17,7 +17,7 @@ repo_vars:
- DOCKERHUB_IMAGE = 'linuxserver/nzbhydra2'
- DEV_DOCKERHUB_IMAGE = 'lsiodev/nzbhydra2'
- PR_DOCKERHUB_IMAGE = 'lspipepr/nzbhydra2'
- DIST_IMAGE = 'alpine'
- DIST_IMAGE = 'ubuntu'
- MULTIARCH='true'
- CI='true'
- CI_WEB='true'
+1
View File
@@ -56,6 +56,7 @@ app_setup_block: |
# changelog
changelogs:
- { date: "03.05.22:", desc: "Rebase to Jammy." }
- { date: "18.04.22:", desc: "Rebase to Alpine 3.15." }
- { date: "01.05.20:", desc: "Reorganize container, Relocate app to /app/nzbhydra2/bin, Create /app/nzbhydra2/package_info, Use nzbhydra2wrapperPy3.py from zip." }
- { date: "14.04.20:", desc: "Correct Name, Hydra2 -> NZBHydra2." }