Compare commits
11
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
546884cba5 | ||
|
|
e03bc7cd18 | ||
|
|
45ab3e9638 | ||
|
|
2fd357afa1 | ||
|
|
8a09912eb5 | ||
|
|
7572cae442 | ||
|
|
d6b39bbca3 | ||
|
|
38cffa98de | ||
|
|
ca21cc0750 | ||
|
|
5cb2235bc0 | ||
|
|
5fed0448df |
@@ -5,6 +5,8 @@ on:
|
||||
- '**/run'
|
||||
- '**/finish'
|
||||
- '**/check'
|
||||
- 'root/migrations/*'
|
||||
|
||||
jobs:
|
||||
permission_check:
|
||||
uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
|
||||
|
||||
Vendored
+17
-36
@@ -255,7 +255,7 @@ pipeline {
|
||||
-v ${WORKSPACE}:/mnt \
|
||||
-e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \
|
||||
-e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \
|
||||
ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
|
||||
ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\
|
||||
apk add --no-cache python3 && \
|
||||
python3 -m venv /lsiopy && \
|
||||
pip install --no-cache-dir -U pip && \
|
||||
@@ -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}"
|
||||
@@ -362,7 +362,7 @@ pipeline {
|
||||
fi
|
||||
echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub"
|
||||
mkdir -p ${TEMPDIR}/docs
|
||||
git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
|
||||
git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation
|
||||
if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then
|
||||
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/
|
||||
cd ${TEMPDIR}/docs/docker-documentation
|
||||
@@ -380,8 +380,8 @@ pipeline {
|
||||
echo "Docs update not needed, skipping"
|
||||
fi
|
||||
mkdir -p ${TEMPDIR}/unraid
|
||||
git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
|
||||
git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
|
||||
git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates
|
||||
git clone --depth=1 https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
|
||||
if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
|
||||
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
||||
elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
|
||||
@@ -535,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} ."
|
||||
}
|
||||
}
|
||||
@@ -566,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} ."
|
||||
}
|
||||
}
|
||||
@@ -594,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) {
|
||||
@@ -710,14 +713,14 @@ pipeline {
|
||||
set -e
|
||||
docker pull ghcr.io/linuxserver/ci:latest
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||
fi
|
||||
docker run --rm \
|
||||
--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}\" \
|
||||
@@ -801,7 +804,7 @@ 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:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
|
||||
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64
|
||||
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
|
||||
fi
|
||||
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
|
||||
@@ -825,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)
|
||||
|
||||
+15
-15
@@ -40,7 +40,7 @@ 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.12 java-archive
|
||||
libacl1 2.3.1-1 deb
|
||||
libapt-pkg6.0 2.4.12 deb
|
||||
libasound2 1.2.6.1-1ubuntu1 deb
|
||||
@@ -56,13 +56,13 @@ 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.7 deb
|
||||
libc6 2.35-0ubuntu3.7 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
|
||||
libcups2 2.4.1op1-1ubuntu4.10 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
|
||||
@@ -92,8 +92,8 @@ libkrb5-3 1.19.2-2ubuntu0.3 deb
|
||||
libkrb5support0 1.19.2-2ubuntu0.3 deb
|
||||
libksba8 1.6.0-2ubuntu0.2 deb
|
||||
liblcms2-2 2.12~rc1-2build2 deb
|
||||
libldap-2.5-0 2.5.17+dfsg-0ubuntu0.22.04.1 deb
|
||||
libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb
|
||||
libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.2 deb
|
||||
libldap-common 2.5.18+dfsg-0ubuntu0.22.04.2 deb
|
||||
liblz4-1 1.9.3-2build2 deb
|
||||
liblzma5 5.2.5-2ubuntu1 deb
|
||||
libmd0 1.0.4-1build1 deb
|
||||
@@ -120,8 +120,8 @@ libpng16-16 1.6.37-3build5 deb
|
||||
libprocps8 2:3.3.17-6ubuntu2.1 deb
|
||||
libpsl5 0.21.0-1.2build2 deb
|
||||
libpython3-stdlib 3.10.6-1~22.04 deb
|
||||
libpython3.10-minimal 3.10.12-1~22.04.3 deb
|
||||
libpython3.10-stdlib 3.10.12-1~22.04.3 deb
|
||||
libpython3.10-minimal 3.10.12-1~22.04.5 deb
|
||||
libpython3.10-stdlib 3.10.12-1~22.04.5 deb
|
||||
libreadline8 8.1.2-1 deb
|
||||
librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb
|
||||
libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb
|
||||
@@ -136,7 +136,7 @@ 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
|
||||
libssl3 3.0.2-0ubuntu1.15 deb
|
||||
libssl3 3.0.2-0ubuntu1.16 deb
|
||||
libstdc++6 12.3.0-1ubuntu1~22.04 deb
|
||||
libsystemd0 249.11-0ubuntu3.12 deb
|
||||
libtasn1-6 4.18.0-4build1 deb
|
||||
@@ -148,7 +148,7 @@ libunistring2 1.0-1 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.7 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
|
||||
@@ -159,8 +159,8 @@ 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
|
||||
openssl 3.0.2-0ubuntu1.15 deb
|
||||
openjdk-17-jre-headless 17.0.12+7-1ubuntu2~22.04 deb
|
||||
openssl 3.0.2-0ubuntu1.16 deb
|
||||
passwd 1:4.8.1-2ubuntu2.2 deb
|
||||
perl-base 5.34.0-3ubuntu1.3 deb
|
||||
pinentry-curses 1.1.1-1build2 deb
|
||||
@@ -168,14 +168,14 @@ procps 2:3.3.17-6ubuntu2.1 deb
|
||||
publicsuffix 20211207.1025-1 deb
|
||||
python3 3.10.6-1~22.04 deb
|
||||
python3-minimal 3.10.6-1~22.04 deb
|
||||
python3.10 3.10.12-1~22.04.3 deb
|
||||
python3.10-minimal 3.10.12-1~22.04.3 deb
|
||||
python3.10 3.10.12-1~22.04.5 deb
|
||||
python3.10-minimal 3.10.12-1~22.04.5 deb
|
||||
readline-common 8.1.2-1 deb
|
||||
sed 4.8-1ubuntu2 deb
|
||||
sensible-utils 0.0.17 deb
|
||||
sysvinit-utils 3.01-1ubuntu1 deb
|
||||
tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb
|
||||
tzdata 2024a-0ubuntu0.22.04 deb
|
||||
tzdata 2024a-0ubuntu0.22.04.1 deb
|
||||
ubuntu-keyring 2021.03.26 deb
|
||||
ucf 3.0043 deb
|
||||
unzip 6.0-26ubuntu3.2 deb
|
||||
|
||||
Reference in New Issue
Block a user