Compare commits
13
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ef56395270 | ||
|
|
563f30d925 | ||
|
|
7be5eb37ed | ||
|
|
a3f05b4c5d | ||
|
|
6a3a677699 | ||
|
|
c9b9f443f2 | ||
|
|
be239cbd34 | ||
|
|
0efc76d68f | ||
|
|
a82c5b59f9 | ||
|
|
7a606ecdea | ||
|
|
7798afa495 | ||
|
|
fb241a21e0 | ||
|
|
b2b7669af9 |
Executable
+20
@@ -0,0 +1,20 @@
|
||||
# This file is globally distributed to all container image projects from
|
||||
# https://github.com/linuxserver/docker-jenkins-builder/blob/master/.editorconfig
|
||||
|
||||
# top-most EditorConfig file
|
||||
root = true
|
||||
|
||||
# Unix-style newlines with a newline ending every file
|
||||
[*]
|
||||
end_of_line = lf
|
||||
insert_final_newline = true
|
||||
# trim_trailing_whitespace may cause unintended issues and should not be globally set true
|
||||
trim_trailing_whitespace = false
|
||||
|
||||
[{Dockerfile*,**.yml}]
|
||||
indent_style = space
|
||||
indent_size = 2
|
||||
|
||||
[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
|
||||
indent_style = space
|
||||
indent_size = 4
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
|
||||
* Read, and fill the Pull Request template
|
||||
* If this is a fix for a typo in code or documentation in the README please file an issue
|
||||
* If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
|
||||
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
|
||||
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
|
||||
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
|
||||
<!--- Before submitting a pull request please check the following -->
|
||||
|
||||
<!--- If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR -->
|
||||
<!--- If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR -->
|
||||
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
|
||||
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
|
||||
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
|
||||
|
||||
@@ -10,7 +10,7 @@ jobs:
|
||||
runs-on: ubuntu-latest
|
||||
|
||||
steps:
|
||||
- uses: actions/stale@v1
|
||||
- uses: actions/stale@v3
|
||||
with:
|
||||
stale-issue-message: "This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
|
||||
stale-pr-message: "This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions."
|
||||
|
||||
Vendored
+20
-7
@@ -58,7 +58,7 @@ pipeline {
|
||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT
|
||||
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/'
|
||||
env.PULL_REQUEST = env.CHANGE_ID
|
||||
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
|
||||
env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.md ./.github/ISSUE_TEMPLATE/issue.feature.md ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/stale.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml ./root/donate.txt'
|
||||
}
|
||||
script{
|
||||
env.LS_RELEASE_NUMBER = sh(
|
||||
@@ -270,7 +270,6 @@ pipeline {
|
||||
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
|
||||
cd ${TEMPDIR}/repo/${LS_REPO}
|
||||
git checkout -f dev
|
||||
cd ${TEMPDIR}/docker-${CONTAINER_NAME}
|
||||
for i in ${TEMPLATES_TO_DELETE}; do
|
||||
git rm "${i}"
|
||||
done
|
||||
@@ -386,7 +385,9 @@ pipeline {
|
||||
// Build Docker container for push to LS Repo
|
||||
stage('Build-Single') {
|
||||
when {
|
||||
environment name: 'MULTIARCH', value: 'false'
|
||||
expression {
|
||||
env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
|
||||
}
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
@@ -411,7 +412,10 @@ pipeline {
|
||||
// Build MultiArch Docker containers for push to LS Repo
|
||||
stage('Build-Multi') {
|
||||
when {
|
||||
environment name: 'MULTIARCH', value: 'true'
|
||||
allOf {
|
||||
environment name: 'MULTIARCH', value: 'true'
|
||||
expression { params.PACKAGE_CHECK == 'false' }
|
||||
}
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
parallel {
|
||||
@@ -516,7 +520,7 @@ pipeline {
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
TEMPDIR=$(mktemp -d)
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
|
||||
@@ -531,6 +535,15 @@ pipeline {
|
||||
apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
|
||||
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
|
||||
chmod 777 /tmp/package_versions.txt'
|
||||
elif [ "${DIST_IMAGE}" == "fedora" ]; then
|
||||
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
|
||||
rpm -qa > /tmp/package_versions.txt && \
|
||||
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
|
||||
chmod 777 /tmp/package_versions.txt'
|
||||
elif [ "${DIST_IMAGE}" == "arch" ]; then
|
||||
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
|
||||
pacman -Q > /tmp/package_versions.txt && \
|
||||
chmod 777 /tmp/package_versions.txt'
|
||||
fi
|
||||
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
|
||||
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
|
||||
@@ -568,7 +581,7 @@ pipeline {
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
echo "Packages were updated. Cleaning up the image and exiting."
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
@@ -592,7 +605,7 @@ pipeline {
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
echo "There are no package updates. Cleaning up the image and exiting."
|
||||
if [ "${MULTIARCH}" == "true" ]; then
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
|
||||
@@ -33,7 +33,6 @@ Find us at:
|
||||
[](https://github.com/linuxserver/docker-nzbhydra2/releases)
|
||||
[](https://github.com/linuxserver/docker-nzbhydra2/packages)
|
||||
[](https://gitlab.com/linuxserver.io/docker-nzbhydra2/container_registry)
|
||||
[](https://microbadger.com/images/linuxserver/nzbhydra2 "Get your own version badge on microbadger.com")
|
||||
[](https://hub.docker.com/r/linuxserver/nzbhydra2)
|
||||
[](https://hub.docker.com/r/linuxserver/nzbhydra2)
|
||||
[](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-nzbhydra2/job/dev/)
|
||||
@@ -76,9 +75,7 @@ The web interface is at `<your ip>:5076` , to set up indexers and connections to
|
||||
|
||||
Here are some example snippets to help you get started creating a container.
|
||||
|
||||
### docker-compose ([recommended](https://docs.linuxserver.io/general/docker-compose))
|
||||
|
||||
Compatible with docker-compose v2 schemas.
|
||||
### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
|
||||
|
||||
```yaml
|
||||
---
|
||||
@@ -99,7 +96,7 @@ services:
|
||||
restart: unless-stopped
|
||||
```
|
||||
|
||||
### docker cli
|
||||
### docker cli ([click here for more info](https://docs.docker.com/engine/reference/commandline/cli/))
|
||||
|
||||
```bash
|
||||
docker run -d \
|
||||
|
||||
+26
-26
@@ -1,7 +1,7 @@
|
||||
adduser3.116ubuntu1
|
||||
apt1.6.13
|
||||
apt-utils1.6.13
|
||||
base-files10.1ubuntu2.10
|
||||
apt1.6.14
|
||||
apt-utils1.6.14
|
||||
base-files10.1ubuntu2.11
|
||||
base-passwd3.5.44
|
||||
bash4.4.18-2ubuntu1.2
|
||||
bsdutils1:2.31.1-0.4ubuntu3.7
|
||||
@@ -9,7 +9,7 @@ bzip21.0.6-8.1ubuntu0.2
|
||||
ca-certificates20210119~18.04.1
|
||||
ca-certificates-java20180516ubuntu1~18.04.1
|
||||
coreutils8.28-1ubuntu1
|
||||
curl7.58.0-2ubuntu3.13
|
||||
curl7.58.0-2ubuntu3.16
|
||||
dash0.5.8-2.10
|
||||
debconf1.5.66ubuntu1
|
||||
debianutils4.8.4
|
||||
@@ -23,24 +23,24 @@ fonts-dejavu-core2.37-1
|
||||
gcc-8-base8.4.0-1ubuntu1~18.04
|
||||
gpgv2.2.4-1ubuntu1.4
|
||||
grep3.1-2build1
|
||||
gzip1.6-5ubuntu1
|
||||
gzip1.6-5ubuntu1.1
|
||||
hostname3.20
|
||||
init-system-helpers1.51
|
||||
java-common0.68ubuntu1~18.04.1
|
||||
jq1.5+dfsg-2
|
||||
krb5-locales1.16-2ubuntu0.2
|
||||
libacl12.2.52-3build1
|
||||
libapt-inst2.01.6.13
|
||||
libapt-pkg5.01.6.13
|
||||
libapt-inst2.01.6.14
|
||||
libapt-pkg5.01.6.14
|
||||
libasn1-8-heimdal7.5.0+dfsg-1
|
||||
libasound21.1.3-5ubuntu0.5
|
||||
libasound2-data1.1.3-5ubuntu0.5
|
||||
libasound21.1.3-5ubuntu0.6
|
||||
libasound2-data1.1.3-5ubuntu0.6
|
||||
libattr11:2.4.47-2build1
|
||||
libaudit11:2.8.2-1ubuntu1.1
|
||||
libaudit-common1:2.8.2-1ubuntu1.1
|
||||
libavahi-client30.7-3.1ubuntu1.2
|
||||
libavahi-common30.7-3.1ubuntu1.2
|
||||
libavahi-common-data0.7-3.1ubuntu1.2
|
||||
libavahi-client30.7-3.1ubuntu1.3
|
||||
libavahi-common30.7-3.1ubuntu1.3
|
||||
libavahi-common-data0.7-3.1ubuntu1.3
|
||||
libblkid12.31.1-0.4ubuntu3.7
|
||||
libbz2-1.01.0.6-8.1ubuntu0.2
|
||||
libc62.27-3ubuntu1.4
|
||||
@@ -48,7 +48,7 @@ libcap-ng00.7.7-3.1
|
||||
libc-bin2.27-3ubuntu1.4
|
||||
libcom-err21.44.1-1ubuntu1.3
|
||||
libcups22.2.7-1ubuntu2.8
|
||||
libcurl47.58.0-2ubuntu3.13
|
||||
libcurl47.58.0-2ubuntu3.16
|
||||
libdb5.35.3.28-13.1ubuntu1.1
|
||||
libdbus-1-31.12.2-1ubuntu1.2
|
||||
libdebconfclient00.213ubuntu1
|
||||
@@ -59,10 +59,10 @@ libffi63.2.1-8
|
||||
libfontconfig12.12.6-0ubuntu2
|
||||
libfreetype62.8.1-2ubuntu2.1
|
||||
libgcc11:8.4.0-1ubuntu1~18.04
|
||||
libgcrypt201.8.1-4ubuntu1.2
|
||||
libgcrypt201.8.1-4ubuntu1.3
|
||||
libglib2.0-02.56.4-0ubuntu0.18.04.8
|
||||
libgmp102:6.1.2+dfsg-2
|
||||
libgnutls303.5.18-1ubuntu1.4
|
||||
libgnutls303.5.18-1ubuntu1.5
|
||||
libgpg-error01.27-6
|
||||
libgraphite2-31.3.11-2
|
||||
libgssapi3-heimdal7.5.0+dfsg-1
|
||||
@@ -71,7 +71,7 @@ libharfbuzz0b1.7.2-1ubuntu1
|
||||
libhcrypto4-heimdal7.5.0+dfsg-1
|
||||
libheimbase1-heimdal7.5.0+dfsg-1
|
||||
libheimntlm0-heimdal7.5.0+dfsg-1
|
||||
libhogweed43.4-1ubuntu0.1
|
||||
libhogweed43.4.1-0ubuntu0.18.04.1
|
||||
libhx509-5-heimdal7.5.0+dfsg-1
|
||||
libidn2-02.0.4-1.1ubuntu0.2
|
||||
libjpeg88c-2ubuntu8
|
||||
@@ -85,22 +85,22 @@ libkrb5support01.16-2ubuntu0.2
|
||||
liblcms2-22.9-1ubuntu0.1
|
||||
libldap-2.4-22.4.45+dfsg-1ubuntu1.10
|
||||
libldap-common2.4.45+dfsg-1ubuntu1.10
|
||||
liblz4-10.0~r131-2ubuntu3
|
||||
liblz4-10.0~r131-2ubuntu3.1
|
||||
liblzma55.2.2-1.3
|
||||
libmount12.31.1-0.4ubuntu3.7
|
||||
libmpdec22.4.2-1ubuntu1
|
||||
libncurses56.1-1ubuntu1.18.04
|
||||
libncursesw56.1-1ubuntu1.18.04
|
||||
libnettle63.4-1ubuntu0.1
|
||||
libnettle63.4.1-0ubuntu0.18.04.1
|
||||
libnghttp2-141.30.0-1ubuntu1
|
||||
libnspr42:4.18-1ubuntu1
|
||||
libnss32:3.35-2ubuntu2.12
|
||||
libonig46.7.0-1
|
||||
libp11-kit00.23.9-2ubuntu0.1
|
||||
libpam0g1.1.8-3.6ubuntu2.18.04.2
|
||||
libpam-modules1.1.8-3.6ubuntu2.18.04.2
|
||||
libpam-modules-bin1.1.8-3.6ubuntu2.18.04.2
|
||||
libpam-runtime1.1.8-3.6ubuntu2.18.04.2
|
||||
libpam0g1.1.8-3.6ubuntu2.18.04.3
|
||||
libpam-modules1.1.8-3.6ubuntu2.18.04.3
|
||||
libpam-modules-bin1.1.8-3.6ubuntu2.18.04.3
|
||||
libpam-runtime1.1.8-3.6ubuntu2.18.04.3
|
||||
libpcre32:8.39-9
|
||||
libpcsclite11.8.23-1
|
||||
libpng16-161.6.34-1ubuntu0.18.04.2
|
||||
@@ -123,12 +123,12 @@ libsepol12.7-1
|
||||
libsmartcols12.31.1-0.4ubuntu3.7
|
||||
libsqlite3-03.22.0-1ubuntu0.4
|
||||
libss21.44.1-1ubuntu1.3
|
||||
libssl1.11.1.1-1ubuntu2.1~18.04.9
|
||||
libssl1.11.1.1-1ubuntu2.1~18.04.13
|
||||
libstdc++68.4.0-1ubuntu1~18.04
|
||||
libsystemd0237-3ubuntu10.47
|
||||
libsystemd0237-3ubuntu10.52
|
||||
libtasn1-64.13-2
|
||||
libtinfo56.1-1ubuntu1.18.04
|
||||
libudev1237-3ubuntu10.47
|
||||
libudev1237-3ubuntu10.52
|
||||
libunistring20.9.9-0ubuntu2
|
||||
libuuid12.31.1-0.4ubuntu3.7
|
||||
libwind0-heimdal7.5.0+dfsg-1
|
||||
@@ -143,7 +143,7 @@ multiarch-support2.27-3ubuntu1.4
|
||||
ncurses-base6.1-1ubuntu1.18.04
|
||||
ncurses-bin6.1-1ubuntu1.18.04
|
||||
openjdk-11-jre-headless11.0.11+9-0ubuntu2~18.04
|
||||
openssl1.1.1-1ubuntu2.1~18.04.9
|
||||
openssl1.1.1-1ubuntu2.1~18.04.13
|
||||
passwd1:4.5-1ubuntu2
|
||||
perl-base5.26.1-6ubuntu0.5
|
||||
procps2:3.3.12-3ubuntu1.2
|
||||
|
||||
Reference in New Issue
Block a user