Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a6e5c6221b | ||
|
|
6ba0453cec | ||
|
|
cebc52bb7a | ||
|
|
e380c90fbe | ||
|
|
6b960e2c72 | ||
|
|
69110efb1c | ||
|
|
de2d914827 | ||
|
|
d84e5fc219 | ||
|
|
277579eeb4 | ||
|
|
46a711853c | ||
|
|
f86146b88c | ||
|
|
c149171cb2 |
@@ -53,7 +53,6 @@ body:
|
||||
options:
|
||||
- x86-64
|
||||
- arm64
|
||||
- armhf
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
|
||||
@@ -1,63 +0,0 @@
|
||||
# syntax=docker/dockerfile:1
|
||||
|
||||
FROM ghcr.io/linuxserver/baseimage-ubuntu:arm32v7-jammy
|
||||
|
||||
# set version label
|
||||
ARG BUILD_DATE
|
||||
ARG VERSION
|
||||
ARG NZBHYDRA2_RELEASE
|
||||
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
|
||||
LABEL maintainer="nemchik"
|
||||
|
||||
# environment settings
|
||||
ARG DEBIAN_FRONTEND="noninteractive"
|
||||
ENV NZBHYDRA2_RELEASE_TYPE="Pre-Release"
|
||||
|
||||
RUN \
|
||||
echo "**** install packages ****" && \
|
||||
apt-get update && \
|
||||
apt-get install --no-install-recommends -y \
|
||||
libfreetype6 \
|
||||
openjdk-17-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" \
|
||||
| jq -r '.[0] | .tag_name'); \
|
||||
fi && \
|
||||
NZBHYDRA2_VER=${NZBHYDRA2_RELEASE#v} && \
|
||||
curl -o \
|
||||
/tmp/nzbhydra2.zip -L \
|
||||
"https://github.com/theotherp/nzbhydra2/releases/download/v${NZBHYDRA2_VER}/nzbhydra2-${NZBHYDRA2_VER}-generic.zip" && \
|
||||
mkdir -p /app/nzbhydra2 && \
|
||||
unzip /tmp/nzbhydra2.zip -d /app/nzbhydra2 && \
|
||||
chmod +x /app/nzbhydra2/nzbhydra2wrapperPy3.py && \
|
||||
if [ -f /app/nzbhydra2/core ]; then chmod +x /app/nzbhydra2/core; fi && \
|
||||
echo "ReleaseType=${NZBHYDRA2_RELEASE_TYPE}\nPackageVersion=${VERSION}\nPackageAuthor=linuxserver.io" > /app/nzbhydra2/package_info && \
|
||||
mkdir -p /defaults && \
|
||||
curl -o \
|
||||
/defaults/nzbhydra.yml -L \
|
||||
"https://raw.githubusercontent.com/theotherp/nzbhydra2/v${NZBHYDRA2_VER}/core/src/main/resources/config/baseConfig.yml" && \
|
||||
sed -i 's/mapIpToHost: true/mapIpToHost: false/' /defaults/nzbhydra.yml && \
|
||||
echo "**** cleanup ****" && \
|
||||
rm -rf \
|
||||
/tmp/* \
|
||||
/var/lib/apt/lists/* \
|
||||
/var/tmp/* \
|
||||
/var/log/* \
|
||||
/app/nzbhydra2/upstart \
|
||||
/app/nzbhydra2/rc.d \
|
||||
/app/nzbhydra2/sysv \
|
||||
/app/nzbhydra2/systemd \
|
||||
/app/nzbhydra2/WindowsService \
|
||||
/app/nzbhydra2/NZBHydra2.exe \
|
||||
"/app/nzbhydra2/NZBHydra2 Console.exe"
|
||||
|
||||
# copy local files
|
||||
COPY root/ /
|
||||
|
||||
# ports and volumes
|
||||
EXPOSE 5076
|
||||
|
||||
VOLUME /config
|
||||
Vendored
+20
-63
@@ -173,7 +173,7 @@ pipeline {
|
||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
|
||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
|
||||
if (env.MULTIARCH == 'true') {
|
||||
env.CI_TAGS = 'amd64-dev-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm32v7-dev-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-dev-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||
env.CI_TAGS = 'amd64-dev-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-dev-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||
} else {
|
||||
env.CI_TAGS = 'dev-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
|
||||
}
|
||||
@@ -196,7 +196,7 @@ pipeline {
|
||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
|
||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
|
||||
if (env.MULTIARCH == 'true') {
|
||||
env.CI_TAGS = 'amd64-dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm32v7-dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
||||
env.CI_TAGS = 'amd64-dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
||||
} else {
|
||||
env.CI_TAGS = 'dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
|
||||
}
|
||||
@@ -219,7 +219,7 @@ pipeline {
|
||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
|
||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
|
||||
if (env.MULTIARCH == 'true') {
|
||||
env.CI_TAGS = 'amd64-dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
env.CI_TAGS = 'amd64-dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
} else {
|
||||
env.CI_TAGS = 'dev-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
}
|
||||
@@ -290,7 +290,7 @@ pipeline {
|
||||
echo "Jenkinsfile is up to date."
|
||||
fi
|
||||
# Stage 2 - Delete old templates
|
||||
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml"
|
||||
OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf"
|
||||
for i in ${OLD_TEMPLATES}; do
|
||||
if [[ -f "${i}" ]]; then
|
||||
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
|
||||
@@ -326,12 +326,13 @@ pipeline {
|
||||
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows
|
||||
mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE
|
||||
cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || :
|
||||
cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || :
|
||||
cd ${TEMPDIR}/repo/${LS_REPO}/
|
||||
if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then
|
||||
echo ".jenkins-external" >> .gitignore
|
||||
git add .gitignore
|
||||
fi
|
||||
git add ${TEMPLATED_FILES}
|
||||
git add readme-vars.yml ${TEMPLATED_FILES}
|
||||
git commit -m 'Bot Updating Templated Files'
|
||||
git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
|
||||
echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
@@ -525,44 +526,6 @@ pipeline {
|
||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
||||
}
|
||||
}
|
||||
stage('Build ARMHF') {
|
||||
agent {
|
||||
label 'ARMHF'
|
||||
}
|
||||
steps {
|
||||
echo "Running on node: ${NODE_NAME}"
|
||||
echo 'Logging into Github'
|
||||
sh '''#! /bin/bash
|
||||
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
|
||||
'''
|
||||
sh "sed -r -i 's|(^FROM .*)|\\1\\n\\nENV LSIO_FIRST_PARTY=true|g' Dockerfile.armhf"
|
||||
sh "docker buildx build \
|
||||
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
|
||||
--label \"org.opencontainers.image.authors=linuxserver.io\" \
|
||||
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-nzbhydra2/packages\" \
|
||||
--label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-nzbhydra2\" \
|
||||
--label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-nzbhydra2\" \
|
||||
--label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \
|
||||
--label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \
|
||||
--label \"org.opencontainers.image.vendor=linuxserver.io\" \
|
||||
--label \"org.opencontainers.image.licenses=GPL-3.0-only\" \
|
||||
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
|
||||
--label \"org.opencontainers.image.title=Nzbhydra2\" \
|
||||
--label \"org.opencontainers.image.description=[Nzbhydra2](https://github.com/theotherp/nzbhydra2) is a meta search application for NZB indexers, the spiritual successor to NZBmegasearcH, and an evolution of the original application [NZBHydra](https://github.com/theotherp/nzbhydra). It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version. \" \
|
||||
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
|
||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
||||
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||
retry(5) {
|
||||
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||
}
|
||||
sh '''#! /bin/bash
|
||||
containers=$(docker ps -aq)
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
fi
|
||||
docker system prune -af --volumes || : '''
|
||||
}
|
||||
}
|
||||
stage('Build ARM64') {
|
||||
agent {
|
||||
label 'ARM64'
|
||||
@@ -703,9 +666,7 @@ pipeline {
|
||||
set -e
|
||||
docker pull ghcr.io/linuxserver/ci:latest
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||
fi
|
||||
docker run --rm \
|
||||
@@ -808,8 +769,6 @@ pipeline {
|
||||
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
|
||||
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
|
||||
if [ "${CI}" == "false" ]; then
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||
fi
|
||||
@@ -817,49 +776,47 @@ pipeline {
|
||||
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
|
||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-dev
|
||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
||||
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-dev
|
||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
||||
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-dev
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
|
||||
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${SEMVER}
|
||||
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
fi
|
||||
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
|
||||
docker push ${MANIFESTIMAGE}:amd64-dev
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-dev
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-dev
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
|
||||
docker push ${MANIFESTIMAGE}:arm32v7-${SEMVER}
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
fi
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:dev || :
|
||||
docker manifest create ${MANIFESTIMAGE}:dev ${MANIFESTIMAGE}:amd64-dev ${MANIFESTIMAGE}:arm32v7-dev ${MANIFESTIMAGE}:arm64v8-dev
|
||||
docker manifest annotate ${MANIFESTIMAGE}:dev ${MANIFESTIMAGE}:arm32v7-dev --os linux --arch arm
|
||||
docker manifest create ${MANIFESTIMAGE}:dev ${MANIFESTIMAGE}:amd64-dev ${MANIFESTIMAGE}:arm64v8-dev
|
||||
docker manifest annotate ${MANIFESTIMAGE}:dev ${MANIFESTIMAGE}:arm64v8-dev --os linux --arch arm64 --variant v8
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
|
||||
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
|
||||
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || :
|
||||
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG} --os linux --arch arm
|
||||
docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
|
||||
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm32v7-${SEMVER} --os linux --arch arm
|
||||
docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8
|
||||
fi
|
||||
token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token')
|
||||
digest=$(curl -s \
|
||||
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
|
||||
--header "Authorization: Bearer ${token}" \
|
||||
"https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-dev")
|
||||
if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-dev || :
|
||||
docker manifest create ${MANIFESTIMAGE}:arm32v7-dev ${MANIFESTIMAGE}:amd64-dev
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-dev
|
||||
fi
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:dev
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
|
||||
|
||||
@@ -58,7 +58,7 @@ The architectures supported by this image are:
|
||||
| :----: | :----: | ---- |
|
||||
| x86-64 | ✅ | amd64-\<version tag\> |
|
||||
| arm64 | ✅ | arm64v8-\<version tag\> |
|
||||
| armhf | ✅ | arm32v7-\<version tag\> |
|
||||
| armhf | ❌ | |
|
||||
|
||||
## Version Tags
|
||||
|
||||
@@ -235,6 +235,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
||||
|
||||
## Versions
|
||||
|
||||
* **04.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)
|
||||
* **22.01.23:** - Update release URL for arch-specific packages.
|
||||
* **20.01.23:** - Update dependencies for v5.
|
||||
* **03.23.22:** - Upgrade JRE to 17, rebase to ubuntu.
|
||||
|
||||
+19
-19
@@ -1,16 +1,17 @@
|
||||
NAME VERSION TYPE
|
||||
adduser 3.118ubuntu5 deb
|
||||
apt 2.4.9 deb
|
||||
apt-utils 2.4.9 deb
|
||||
apt 2.4.10 deb
|
||||
apt-utils 2.4.10 deb
|
||||
base-files 12ubuntu4.3 deb
|
||||
base-passwd 3.5.52build1 deb
|
||||
bash 5.1-6ubuntu1 deb
|
||||
bash 5.1.16 binary
|
||||
bsdutils 1:2.37.2-4ubuntu3 deb
|
||||
ca-certificates 20230311ubuntu0.22.04.1 deb
|
||||
ca-certificates-java java-archive
|
||||
ca-certificates-java 20190909ubuntu1.2 deb
|
||||
coreutils 8.32-4.1ubuntu1 deb
|
||||
curl 7.81.0-1ubuntu1.10 deb
|
||||
curl 7.81.0-1ubuntu1.13 deb
|
||||
dash 0.5.11+git20210903+057cd650a4ed-3build1 deb
|
||||
debconf 1.5.79ubuntu1 deb
|
||||
debianutils 5.5-1ubuntu2 deb
|
||||
@@ -38,9 +39,9 @@ hostname 3.23ubuntu2 deb
|
||||
init-system-helpers 1.62 deb
|
||||
java-common 0.72build2 deb
|
||||
jq 1.6-2.1ubuntu3 deb
|
||||
jrt-fs 17.0.7 java-archive
|
||||
jrt-fs 17.0.8.1 java-archive
|
||||
libacl1 2.3.1-1 deb
|
||||
libapt-pkg6.0 2.4.9 deb
|
||||
libapt-pkg6.0 2.4.10 deb
|
||||
libasound2 1.2.6.1-1ubuntu1 deb
|
||||
libasound2-data 1.2.6.1-1ubuntu1 deb
|
||||
libassuan0 2.5.5-1build1 deb
|
||||
@@ -57,11 +58,11 @@ libbz2-1.0 1.0.8-5build1 deb
|
||||
libc-bin 2.35-0ubuntu3.1 deb
|
||||
libc6 2.35-0ubuntu3.1 deb
|
||||
libcap-ng0 0.7.9-2.2build3 deb
|
||||
libcap2 1:2.44-1build3 deb
|
||||
libcap2 1:2.44-1ubuntu0.22.04.1 deb
|
||||
libcom-err2 1.46.5-2ubuntu1.1 deb
|
||||
libcrypt1 1:4.4.27-1 deb
|
||||
libcups2 2.4.1op1-1ubuntu4.2 deb
|
||||
libcurl4 7.81.0-1ubuntu1.10 deb
|
||||
libcups2 2.4.1op1-1ubuntu4.7 deb
|
||||
libcurl4 7.81.0-1ubuntu1.13 deb
|
||||
libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb
|
||||
libdbus-1-3 1.12.20-2ubuntu4.1 deb
|
||||
libdebconfclient0 0.261ubuntu1 deb
|
||||
@@ -72,7 +73,7 @@ libfontconfig1 2.13.1-4.2ubuntu5 deb
|
||||
libfreetype6 2.11.1+dfsg-1ubuntu0.2 deb
|
||||
libgcc-s1 12.1.0-2ubuntu1~22.04 deb
|
||||
libgcrypt20 1.9.4-3ubuntu3 deb
|
||||
libglib2.0-0 2.72.4-0ubuntu2 deb
|
||||
libglib2.0-0 2.72.4-0ubuntu2.2 deb
|
||||
libgmp10 2:6.2.1+dfsg-3ubuntu1 deb
|
||||
libgnutls30 3.7.3-4ubuntu1.2 deb
|
||||
libgpg-error0 1.43-3 deb
|
||||
@@ -90,8 +91,8 @@ libkrb5-3 1.19.2-2ubuntu0.2 deb
|
||||
libkrb5support0 1.19.2-2ubuntu0.2 deb
|
||||
libksba8 1.6.0-2ubuntu0.2 deb
|
||||
liblcms2-2 2.12~rc1-2build2 deb
|
||||
libldap-2.5-0 2.5.14+dfsg-0ubuntu0.22.04.2 deb
|
||||
libldap-common 2.5.14+dfsg-0ubuntu0.22.04.2 deb
|
||||
libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.1 deb
|
||||
libldap-common 2.5.16+dfsg-0ubuntu0.22.04.1 deb
|
||||
liblz4-1 1.9.3-2build2 deb
|
||||
liblzma5 5.2.5-2ubuntu1 deb
|
||||
libmd0 1.0.4-1build1 deb
|
||||
@@ -113,13 +114,13 @@ libpam-runtime 1.4.0-11ubuntu2.3 deb
|
||||
libpam0g 1.4.0-11ubuntu2.3 deb
|
||||
libpcre2-8-0 10.39-3ubuntu0.1 deb
|
||||
libpcre3 2:8.39-13ubuntu0.22.04.1 deb
|
||||
libpcsclite1 1.9.5-3 deb
|
||||
libpcsclite1 1.9.5-3ubuntu1 deb
|
||||
libpng16-16 1.6.37-3build5 deb
|
||||
libprocps8 2:3.3.17-6ubuntu2 deb
|
||||
libpsl5 0.21.0-1.2build2 deb
|
||||
libpython3-stdlib 3.10.6-1~22.04 deb
|
||||
libpython3.10-minimal 3.10.6-1~22.04.2ubuntu1.1 deb
|
||||
libpython3.10-stdlib 3.10.6-1~22.04.2ubuntu1.1 deb
|
||||
libpython3.10-minimal 3.10.12-1~22.04.2 deb
|
||||
libpython3.10-stdlib 3.10.12-1~22.04.2 deb
|
||||
libreadline8 8.1.2-1 deb
|
||||
librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb
|
||||
libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb
|
||||
@@ -146,7 +147,7 @@ libunistring2 1.0-1 deb
|
||||
libuuid1 2.37.2-4ubuntu3 deb
|
||||
libxxhash0 0.8.1-1 deb
|
||||
libzstd1 1.4.8+dfsg-3build1 deb
|
||||
locales 2.35-0ubuntu3.1 deb
|
||||
locales 2.35-0ubuntu3.4 deb
|
||||
login 1:4.8.1-2ubuntu2.1 deb
|
||||
logsave 1.46.5-2ubuntu1.1 deb
|
||||
lsb-base 11.1.0ubuntu4 deb
|
||||
@@ -157,18 +158,17 @@ ncurses-base 6.3-2ubuntu0.1 deb
|
||||
ncurses-bin 6.3-2ubuntu0.1 deb
|
||||
netcat 1.218-4ubuntu1 deb
|
||||
netcat-openbsd 1.218-4ubuntu1 deb
|
||||
openjdk-17-jre-headless 17.0.7+7~us1-0ubuntu1~22.04.2 deb
|
||||
openjdk-17-jre-headless 17.0.8.1+1~us1-0ubuntu1~22.04 deb
|
||||
openssl 3.0.2-0ubuntu1.10 deb
|
||||
passwd 1:4.8.1-2ubuntu2.1 deb
|
||||
perl-base 5.34.0-3ubuntu1.2 deb
|
||||
pinentry-curses 1.1.1-1build2 deb
|
||||
procps 2:3.3.17-6ubuntu2 deb
|
||||
publicsuffix 20211207.1025-1 deb
|
||||
python 3.10.6 binary
|
||||
python3 3.10.6-1~22.04 deb
|
||||
python3-minimal 3.10.6-1~22.04 deb
|
||||
python3.10 3.10.6-1~22.04.2ubuntu1.1 deb
|
||||
python3.10-minimal 3.10.6-1~22.04.2ubuntu1.1 deb
|
||||
python3.10 3.10.12-1~22.04.2 deb
|
||||
python3.10-minimal 3.10.12-1~22.04.2 deb
|
||||
readline-common 8.1.2-1 deb
|
||||
sed 4.8-1ubuntu2 deb
|
||||
sensible-utils 0.0.17 deb
|
||||
|
||||
+24
-31
@@ -10,36 +10,31 @@ project_blurb: |
|
||||
It provides easy access to a number of raw and newznab based indexers. The application NZBHydra 2 is currently in its early stages and is in active development. Be wary that there may be some compatibility issues for those migrating from V1 to V2, so ensure you back up your old configuration before moving over to the new version.
|
||||
project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
|
||||
project_blurb_optional_extras_enabled: false
|
||||
|
||||
# supported architectures
|
||||
available_architectures:
|
||||
- { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
|
||||
- { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
|
||||
- { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}
|
||||
|
||||
- {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
|
||||
- {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
|
||||
# development version
|
||||
development_versions: true
|
||||
development_versions_items:
|
||||
- { tag: "latest", desc: "Stable releases" }
|
||||
- { tag: "dev", desc: "Prereleases from their GitHub" }
|
||||
|
||||
- {tag: "latest", desc: "Stable releases"}
|
||||
- {tag: "dev", desc: "Prereleases from their GitHub"}
|
||||
# container parameters
|
||||
common_param_env_vars_enabled: true
|
||||
param_container_name: "{{ project_name }}"
|
||||
param_usage_include_net: false
|
||||
param_usage_include_env: true
|
||||
param_env_vars:
|
||||
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
|
||||
- {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."}
|
||||
param_usage_include_vols: true
|
||||
param_volumes:
|
||||
- { vol_path: "/config", vol_host_path: "<path to data>", desc: "Where nzbhydra2 should store config files." }
|
||||
- { vol_path: "/downloads", vol_host_path: "<nzb download>", desc: "NZB download folder." }
|
||||
- {vol_path: "/config", vol_host_path: "<path to data>", desc: "Where nzbhydra2 should store config files."}
|
||||
- {vol_path: "/downloads", vol_host_path: "<nzb download>", desc: "NZB download folder."}
|
||||
param_usage_include_ports: true
|
||||
param_ports:
|
||||
- { external_port: "5076", internal_port: "5076", port_desc: "WebUI" }
|
||||
- {external_port: "5076", internal_port: "5076", port_desc: "WebUI"}
|
||||
param_device_map: false
|
||||
cap_add_param: false
|
||||
|
||||
# optional container parameters
|
||||
opt_param_usage_include_env: false
|
||||
opt_param_usage_include_vols: false
|
||||
@@ -47,27 +42,25 @@ opt_param_usage_include_ports: false
|
||||
opt_param_device_map: false
|
||||
opt_cap_add_param: false
|
||||
optional_block_1: false
|
||||
|
||||
# application setup block
|
||||
app_setup_block_enabled: true
|
||||
app_setup_block: |
|
||||
The web interface is at `<your ip>:5076` , to set up indexers and connections to your nzb download applications.
|
||||
|
||||
# changelog
|
||||
|
||||
changelogs:
|
||||
- { date: "22.01.23:", desc: "Update release URL for arch-specific packages." }
|
||||
- { date: "20.01.23:", desc: "Update dependencies for v5." }
|
||||
- { date: "03.23.22:", desc: "Upgrade JRE to 17, rebase to ubuntu." }
|
||||
- { 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: "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." }
|
||||
- { date: "05.01.20:", desc: "Add dev tag for prereleases." }
|
||||
- { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
|
||||
- { date: "11.02.19:", desc: "Add pipeline logic and multi arch." }
|
||||
- { date: "18.08.18:", desc: "Bump java version to 10, (bionic currently refers to it as version 11)." }
|
||||
- { date: "10.08.18:", desc: "Rebase to ubuntu bionic." }
|
||||
- { date: "15.04.18:", desc: "Change to port 5076 in the Dockerfile." }
|
||||
- { date: "11.01.18:", desc: "Initial Release." }
|
||||
- {date: "04.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
|
||||
- {date: "22.01.23:", desc: "Update release URL for arch-specific packages."}
|
||||
- {date: "20.01.23:", desc: "Update dependencies for v5."}
|
||||
- {date: "03.23.22:", desc: "Upgrade JRE to 17, rebase to ubuntu."}
|
||||
- {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: "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."}
|
||||
- {date: "05.01.20:", desc: "Add dev tag for prereleases."}
|
||||
- {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."}
|
||||
- {date: "11.02.19:", desc: "Add pipeline logic and multi arch."}
|
||||
- {date: "18.08.18:", desc: "Bump java version to 10, (bionic currently refers to it as version 11)."}
|
||||
- {date: "10.08.18:", desc: "Rebase to ubuntu bionic."}
|
||||
- {date: "15.04.18:", desc: "Change to port 5076 in the Dockerfile."}
|
||||
- {date: "11.01.18:", desc: "Initial Release."}
|
||||
|
||||
Reference in New Issue
Block a user