Merge pull request #5 from linuxserver/dev-releases

Use external_type: github_devel
linuxserver · Apr 29, 2020 · c7479ae · c7479ae
2 parents 96ad800 + 30ef5b0
commit c7479ae
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 87 deletions.
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -1 +1,3 @@
+github: linuxserver
 open_collective: linuxserver
+custom: ["https://github.com/theotherp/nzbhydra2#donate",]
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_DATE
 ARG VERSION
 ARG NZBHYDRA2_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca"
+LABEL maintainer="aptalca,nemchik"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -5,7 +5,7 @@ ARG BUILD_DATE
 ARG VERSION
 ARG NZBHYDRA2_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca"
+LABEL maintainer="aptalca,nemchik"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -5,7 +5,7 @@ ARG BUILD_DATE
 ARG VERSION
 ARG NZBHYDRA2_RELEASE
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="aptalca"
+LABEL maintainer="aptalca,nemchik"
 
 # environment settings
 ARG DEBIAN_FRONTEND="noninteractive"

diff --git a/Jenkinsfile b/Jenkinsfile
diff --git a/README.md b/README.md
@@ -224,6 +224,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **29.04.20:** - Include stable releases incrementally with dev releases.
 * **14.04.20:** - Correct Name, Hydra2 -> Nzbhydra2.
 * **08.01.20:** - Switch to python3.
 * **05.01.20:** - Add dev tag for prereleases.

diff --git a/jenkins-vars.yml b/jenkins-vars.yml
@@ -2,13 +2,14 @@
 
 # jenkins variables
 project_name: docker-nzbhydra2
-external_type: custom_json
+external_type: github_devel
 release_type: prerelease
 release_tag: dev
 ls_branch: dev
 repo_vars:
-  - JSON_URL = 'https://api.github.com/repos/theotherp/nzbhydra2/releases'
-  - JSON_PATH = 'first(.[] | select(.prerelease == true)) | .tag_name'
+  - EXT_GIT_BRANCH = 'develop'
+  - EXT_USER = 'theotherp'
+  - EXT_REPO = 'nzbhydra2'
   - BUILD_VERSION_ARG = 'NZBHYDRA2_RELEASE'
   - LS_USER = 'linuxserver'
   - LS_REPO = 'docker-nzbhydra2'
@@ -26,3 +27,6 @@ repo_vars:
   - CI_DOCKERENV='TZ=US/Pacific'
   - CI_AUTH='user:password'
   - CI_WEBPATH=''
+sponsor_links:
+  - { name: "NZBHydra 2", url: "https://github.com/theotherp/nzbhydra2#donate" }
+
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -56,6 +56,7 @@ app_setup_block: |
 # changelog
 
 changelogs:
+  - { 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." }

diff --git a/root/donate.txt b/root/donate.txt
@@ -0,0 +1 @@
+NZBHydra 2: https://github.com/theotherp/nzbhydra2#donate