Compare commits
14
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 LinuxServer-CI
|
38cffa98de | ||
|
LinuxServer-CI
|
ca21cc0750 | ||
|
LinuxServer-CI
|
5cb2235bc0 | ||
|
LinuxServer-CI
|
5fed0448df | ||
|
LinuxServer-CI
|
3021d004ac | ||
|
LinuxServer-CI
|
e059ec96ac | ||
|
LinuxServer-CI
|
3743fe8aec | ||
|
LinuxServer-CI
|
8bb6b7bed4 | ||
|
LinuxServer-CI
|
929b0be074 | ||
|
LinuxServer-CI
|
8972abbdfe | ||
|
LinuxServer-CI
|
1196067618 | ||
|
LinuxServer-CI
|
418a60c33b | ||
|
LinuxServer-CI
|
98e90df9c3 | ||
|
LinuxServer-CI
|
b831303e72 |
Vendored
+16
-33
@@ -285,7 +285,7 @@ pipeline {
|
||||
# ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos
|
||||
# ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github
|
||||
git clone --branch dev --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME}
|
||||
docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest
|
||||
docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest
|
||||
echo "Starting Stage 1 - Jenkinsfile update"
|
||||
if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then
|
||||
mkdir -p ${TEMPDIR}/repo
|
||||
@@ -305,7 +305,7 @@ pipeline {
|
||||
echo "Jenkinsfile is up to date."
|
||||
fi
|
||||
echo "Starting 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 Dockerfile.armhf"
|
||||
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"
|
||||
for i in ${OLD_TEMPLATES}; do
|
||||
if [[ -f "${i}" ]]; then
|
||||
TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}"
|
||||
@@ -391,7 +391,9 @@ pipeline {
|
||||
echo "Updating Unraid template"
|
||||
cd ${TEMPDIR}/unraid/templates/
|
||||
GH_TEMPLATES_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||')
|
||||
if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
|
||||
if grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list && [[ -f ${TEMPDIR}/unraid/templates/unraid/deprecated/${CONTAINER_NAME}.xml ]]; then
|
||||
echo "Image is on the ignore list, and already in the deprecation folder."
|
||||
elif grep -wq "${CONTAINER_NAME}" ${TEMPDIR}/unraid/templates/unraid/ignore.list; then
|
||||
echo "Image is on the ignore list, marking Unraid template as deprecated"
|
||||
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml ${TEMPDIR}/unraid/templates/unraid/
|
||||
git add -u unraid/${CONTAINER_NAME}.xml
|
||||
@@ -533,6 +535,7 @@ pipeline {
|
||||
--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 -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
|
||||
--provenance=false --sbom=false \
|
||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
||||
}
|
||||
}
|
||||
@@ -564,6 +567,7 @@ pipeline {
|
||||
--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 -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
|
||||
--provenance=false --sbom=false \
|
||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
||||
}
|
||||
}
|
||||
@@ -592,6 +596,7 @@ pipeline {
|
||||
--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.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
|
||||
--provenance=false --sbom=false \
|
||||
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
|
||||
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||
retry(5) {
|
||||
@@ -618,7 +623,7 @@ pipeline {
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
TEMPDIR=$(mktemp -d)
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then
|
||||
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
|
||||
@@ -715,7 +720,7 @@ pipeline {
|
||||
--shm-size=1gb \
|
||||
-v /var/run/docker.sock:/var/run/docker.sock \
|
||||
-e IMAGE=\"${IMAGE}\" \
|
||||
-e DELAY_START=\"${CI_DELAY}\" \
|
||||
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
|
||||
-e TAGS=\"${CI_TAGS}\" \
|
||||
-e META_TAG=\"${META_TAG}\" \
|
||||
-e PORT=\"${CI_PORT}\" \
|
||||
@@ -823,35 +828,13 @@ pipeline {
|
||||
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
|
||||
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
fi
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:dev || :
|
||||
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}: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}:arm64v8-${EXT_RELEASE_TAG}
|
||||
docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8
|
||||
done
|
||||
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
|
||||
docker buildx imagetools create -t ${MANIFESTIMAGE}:dev ${MANIFESTIMAGE}:amd64-dev ${MANIFESTIMAGE}:arm64v8-dev
|
||||
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
|
||||
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || :
|
||||
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}
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER}
|
||||
docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
|
||||
fi
|
||||
done
|
||||
'''
|
||||
|
||||
@@ -28,7 +28,7 @@ Find us at:
|
||||
|
||||
# [linuxserver/nzbhydra2](https://github.com/linuxserver/docker-nzbhydra2)
|
||||
|
||||
[](https://scarf.sh/gateway/linuxserver-ci/docker/linuxserver%2Fnzbhydra2)
|
||||
[](https://scarf.sh)
|
||||
[](https://github.com/linuxserver/docker-nzbhydra2)
|
||||
[](https://github.com/linuxserver/docker-nzbhydra2/releases)
|
||||
[](https://github.com/linuxserver/docker-nzbhydra2/packages)
|
||||
|
||||
+24
-24
@@ -1,18 +1,18 @@
|
||||
NAME VERSION TYPE
|
||||
adduser 3.118ubuntu5 deb
|
||||
apt 2.4.11 deb
|
||||
apt-utils 2.4.11 deb
|
||||
apt 2.4.12 deb
|
||||
apt-utils 2.4.12 deb
|
||||
base-files 12ubuntu4.6 deb
|
||||
base-passwd 3.5.52build1 deb
|
||||
bash 5.1-6ubuntu1.1 deb
|
||||
bash 5.1.16 binary
|
||||
bsdutils 1:2.37.2-4ubuntu3 deb
|
||||
bsdutils 1:2.37.2-4ubuntu3.4 deb
|
||||
ca-certificates 20230311ubuntu0.22.04.1 deb
|
||||
ca-certificates-java java-archive
|
||||
ca-certificates-java 20190909ubuntu1.2 deb
|
||||
coreutils 8.32-4.1ubuntu1.1 deb
|
||||
catatonit 0.1.7-1 deb
|
||||
coreutils 8.32-4.1ubuntu1.2 deb
|
||||
cron 3.0pl1-137ubuntu3 deb
|
||||
curl 7.81.0-1ubuntu1.15 deb
|
||||
curl 7.81.0-1ubuntu1.16 deb
|
||||
dash 0.5.11+git20210903+057cd650a4ed-3build1 deb
|
||||
debconf 1.5.79ubuntu1 deb
|
||||
debianutils 5.5-1ubuntu2 deb
|
||||
@@ -40,9 +40,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.10 java-archive
|
||||
jrt-fs 17.0.11 java-archive
|
||||
libacl1 2.3.1-1 deb
|
||||
libapt-pkg6.0 2.4.11 deb
|
||||
libapt-pkg6.0 2.4.12 deb
|
||||
libasound2 1.2.6.1-1ubuntu1 deb
|
||||
libasound2-data 1.2.6.1-1ubuntu1 deb
|
||||
libassuan0 2.5.5-1build1 deb
|
||||
@@ -52,18 +52,18 @@ libaudit1 1:3.0.7-1build1 deb
|
||||
libavahi-client3 0.8-5ubuntu5.2 deb
|
||||
libavahi-common-data 0.8-5ubuntu5.2 deb
|
||||
libavahi-common3 0.8-5ubuntu5.2 deb
|
||||
libblkid1 2.37.2-4ubuntu3 deb
|
||||
libblkid1 2.37.2-4ubuntu3.4 deb
|
||||
libbrotli1 1.0.9-2build6 deb
|
||||
libbsd0 0.11.5-1 deb
|
||||
libbz2-1.0 1.0.8-5build1 deb
|
||||
libc-bin 2.35-0ubuntu3.6 deb
|
||||
libc6 2.35-0ubuntu3.6 deb
|
||||
libc-bin 2.35-0ubuntu3.8 deb
|
||||
libc6 2.35-0ubuntu3.8 deb
|
||||
libcap-ng0 0.7.9-2.2build3 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.8 deb
|
||||
libcurl4 7.81.0-1ubuntu1.15 deb
|
||||
libcurl4 7.81.0-1ubuntu1.16 deb
|
||||
libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb
|
||||
libdbus-1-3 1.12.20-2ubuntu4.1 deb
|
||||
libdebconfclient0 0.261ubuntu1 deb
|
||||
@@ -74,9 +74,9 @@ libfontconfig1 2.13.1-4.2ubuntu5 deb
|
||||
libfreetype6 2.11.1+dfsg-1ubuntu0.2 deb
|
||||
libgcc-s1 12.3.0-1ubuntu1~22.04 deb
|
||||
libgcrypt20 1.9.4-3ubuntu3 deb
|
||||
libglib2.0-0 2.72.4-0ubuntu2.2 deb
|
||||
libglib2.0-0 2.72.4-0ubuntu2.3 deb
|
||||
libgmp10 2:6.2.1+dfsg-3ubuntu1 deb
|
||||
libgnutls30 3.7.3-4ubuntu1.4 deb
|
||||
libgnutls30 3.7.3-4ubuntu1.5 deb
|
||||
libgpg-error0 1.43-3 deb
|
||||
libgraphite2-3 1.3.14-1build2 deb
|
||||
libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb
|
||||
@@ -97,16 +97,16 @@ libldap-common 2.5.17+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
|
||||
libmount1 2.37.2-4ubuntu3 deb
|
||||
libmount1 2.37.2-4ubuntu3.4 deb
|
||||
libmpdec3 2.5.1-2build2 deb
|
||||
libncurses6 6.3-2ubuntu0.1 deb
|
||||
libncursesw6 6.3-2ubuntu0.1 deb
|
||||
libnettle8 3.7.3-1build2 deb
|
||||
libnghttp2-14 1.43.0-1ubuntu0.1 deb
|
||||
libnghttp2-14 1.43.0-1ubuntu0.2 deb
|
||||
libnpth0 1.6-3build2 deb
|
||||
libnsl2 1.3.0-2build2 deb
|
||||
libnspr4 2:4.32-3build1 deb
|
||||
libnss3 2:3.68.2-0ubuntu1.2 deb
|
||||
libnspr4 2:4.35-0ubuntu0.22.04.1 deb
|
||||
libnss3 2:3.98-0ubuntu0.22.04.2 deb
|
||||
libonig5 6.9.7.1-2build1 deb
|
||||
libp11-kit0 0.24.0-6build1 deb
|
||||
libpam-modules 1.4.0-11ubuntu2.4 deb
|
||||
@@ -132,7 +132,7 @@ libselinux1 3.3-1build2 deb
|
||||
libsemanage-common 3.3-1build2 deb
|
||||
libsemanage2 3.3-1build2 deb
|
||||
libsepol2 3.3-1build1 deb
|
||||
libsmartcols1 2.37.2-4ubuntu3 deb
|
||||
libsmartcols1 2.37.2-4ubuntu3.4 deb
|
||||
libsqlite3-0 3.37.2-2ubuntu0.3 deb
|
||||
libss2 1.46.5-2ubuntu1.1 deb
|
||||
libssh-4 0.9.6-2ubuntu0.22.04.3 deb
|
||||
@@ -145,21 +145,21 @@ libtirpc-common 1.3.2-2ubuntu0.1 deb
|
||||
libtirpc3 1.3.2-2ubuntu0.1 deb
|
||||
libudev1 249.11-0ubuntu3.12 deb
|
||||
libunistring2 1.0-1 deb
|
||||
libuuid1 2.37.2-4ubuntu3 deb
|
||||
libuuid1 2.37.2-4ubuntu3.4 deb
|
||||
libxxhash0 0.8.1-1 deb
|
||||
libzstd1 1.4.8+dfsg-3build1 deb
|
||||
locales 2.35-0ubuntu3.6 deb
|
||||
locales 2.35-0ubuntu3.8 deb
|
||||
login 1:4.8.1-2ubuntu2.2 deb
|
||||
logsave 1.46.5-2ubuntu1.1 deb
|
||||
lsb-base 11.1.0ubuntu4 deb
|
||||
mawk 1.3.4.20200120-3 deb
|
||||
media-types 7.0.0 deb
|
||||
mount 2.37.2-4ubuntu3 deb
|
||||
mount 2.37.2-4ubuntu3.4 deb
|
||||
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.10+7-1~22.04.1 deb
|
||||
openjdk-17-jre-headless 17.0.11+9-1~22.04.1 deb
|
||||
openssl 3.0.2-0ubuntu1.15 deb
|
||||
passwd 1:4.8.1-2ubuntu2.2 deb
|
||||
perl-base 5.34.0-3ubuntu1.3 deb
|
||||
@@ -180,5 +180,5 @@ ubuntu-keyring 2021.03.26 deb
|
||||
ucf 3.0043 deb
|
||||
unzip 6.0-26ubuntu3.2 deb
|
||||
usrmerge 25ubuntu2 deb
|
||||
util-linux 2.37.2-4ubuntu3 deb
|
||||
util-linux 2.37.2-4ubuntu3.4 deb
|
||||
zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb
|
||||
|
||||
Reference in New Issue
Block a user