Bot Updating Package Versions

filter out pull requests from api response

Dockerfile

@@ -19,7 +19,7 @@ RUN \
  echo "**** install radarr ****" && \
  if [ -z ${RADARR_RELEASE+x} ]; then \
 	RADARR_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | \
-	jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite")) | .version'); \
+	jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite") | select(.pullRequestId == null)) | .version'); \
  fi && \
  RADARR_JOBID=$(curl -s "https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/build/${RADARR_RELEASE}" | jq -jr '. | .build.jobs[0].jobId') \
  RADARR_DURL="https://ci.appveyor.com/api/buildjobs/${RADARR_JOBID}/artifacts/_artifacts/Radarr.aphrodite.${RADARR_RELEASE}.linux.tar.gz"; \

Dockerfile.aarch64

@@ -19,7 +19,7 @@ RUN \
  echo "**** install radarr ****" && \
  if [ -z ${RADARR_RELEASE+x} ]; then \
 	RADARR_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | \
-	jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite")) | .version'); \
+	jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite") | select(.pullRequestId == null)) | .version'); \
  fi && \
  RADARR_JOBID=$(curl -s "https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/build/${RADARR_RELEASE}" | jq -jr '. | .build.jobs[0].jobId') \
  RADARR_DURL="https://ci.appveyor.com/api/buildjobs/${RADARR_JOBID}/artifacts/_artifacts/Radarr.aphrodite.${RADARR_RELEASE}.linux.tar.gz"; \

Dockerfile.armhf

@@ -19,7 +19,7 @@ RUN \
  echo "**** install radarr ****" && \
  if [ -z ${RADARR_RELEASE+x} ]; then \
 	RADARR_RELEASE=$(curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | \
-	jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite")) | .version'); \
+	jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite") | select(.pullRequestId == null)) | .version'); \
  fi && \
  RADARR_JOBID=$(curl -s "https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/build/${RADARR_RELEASE}" | jq -jr '. | .build.jobs[0].jobId') \
  RADARR_DURL="https://ci.appveyor.com/api/buildjobs/${RADARR_JOBID}/artifacts/_artifacts/Radarr.aphrodite.${RADARR_RELEASE}.linux.tar.gz"; \

Jenkinsfile

@@ -104,7 +104,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite")) | .version' ''',
+            script: ''' curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite") | select(.pullRequestId == null)) | .version' ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }

README.md

@@ -25,7 +25,7 @@ Find us at:
 [Radarr](https://github.com/Radarr/Radarr) - A fork of Sonarr to work with movies à la Couchpotato.
 
 
-[![radarr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr.png)](https://github.com/Radarr/Radarr)
+[![radarr](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr_alpha.png)](https://github.com/Radarr/Radarr)
 
 ## Supported Architectures
 
@@ -171,6 +171,9 @@ Below are the instructions for updating containers:
   containrrr/watchtower \
   --run-once radarr
   ```
+
+**Note:** We do not endorse the use of Watchtower as a solution to automated updates of existing Docker containers. In fact we generally discourage automated updates. However, this is a useful tool for one-time manual updates of containers where you have forgotten the original parameters. In the long term, we highly recommend using Docker Compose.
+
 * You can also remove the old dangling images: `docker image prune`
 
 ## Building locally

jenkins-vars.yml

@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-radarr
 external_type: na
-custom_version_command: curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite")) | .version'
+custom_version_command: curl -sL GET https://ci.appveyor.com/api/projects/galli-leo/radarr-usby1/history?recordsNumber=100 | jq -r '. | first(.builds[] | select(.status == "success") | select(.branch =="aphrodite") | select(.pullRequestId == null)) | .version'
 release_type: prerelease
 release_tag: preview
 ls_branch: preview

package_versions.txt

@@ -4,12 +4,12 @@ apt-transport-https1.6.11
 apt-utils1.6.11
 base-files10.1ubuntu2.4
 base-passwd3.5.44
-bash4.4.18-2ubuntu1.1
+bash4.4.18-2ubuntu1.2
 binutils2.30-21ubuntu1~18.04.2
 binutils-common2.30-21ubuntu1~18.04.2
 binutils-x86-64-linux-gnu2.30-21ubuntu1~18.04.2
 bsdutils1:2.31.1-0.4ubuntu3.3
-bzip21.0.6-8.1
+bzip21.0.6-8.1ubuntu0.2
 ca-certificates20180409
 ca-certificates-mono5.20.1.19-0xamarin2+ubuntu1804b1
 cli-common0.9+xamarin8+ubuntu1804b1
@@ -55,7 +55,7 @@ libaudit-common1:2.8.2-1ubuntu1
 libbinutils2.30-21ubuntu1~18.04.2
 libblkid12.31.1-0.4ubuntu3.3
 libbsd00.8.7-1
-libbz2-1.01.0.6-8.1
+libbz2-1.01.0.6-8.1ubuntu0.2
 libc62.27-3ubuntu1
 libcairo21.15.10-2ubuntu0.1
 libcap-ng00.7.7-3.1
@@ -68,7 +68,7 @@ libdb5.35.3.28-13.1ubuntu1.1
 libdebconfclient00.213ubuntu1
 libdpkg-perl1.19.0.5ubuntu2.1
 libexif120.6.21-4
-libexpat12.2.5-3
+libexpat12.2.5-3ubuntu0.1
 libext2fs21.44.1-1ubuntu1.1
 libfdisk12.31.1-0.4ubuntu3.3
 libffi63.2.1-8
@@ -80,7 +80,7 @@ libgdbm51.14.1-6
 libgdbm-compat41.14.1-6
 libgdiplus5.6.1-0xamarin1+ubuntu1804b1
 libgif75.1.4-2
-libglib2.0-02.56.4-0ubuntu0.18.04.3
+libglib2.0-02.56.4-0ubuntu0.18.04.4
 libgmp102:6.1.2+dfsg-2
 libgnutls303.5.18-1ubuntu1.1
 libgpg-error01.27-6
@@ -293,13 +293,13 @@ libsepol12.7-1
 libsmartcols12.31.1-0.4ubuntu3.3
 libsqlite3-03.22.0-1ubuntu0.1
 libss21.44.1-1ubuntu1.1
-libssl1.11.1.1-1ubuntu2.1~18.04.2
+libssl1.11.1.1-1ubuntu2.1~18.04.3
 libstdc++68.3.0-6ubuntu1~18.04.1
-libsystemd0237-3ubuntu10.22
+libsystemd0237-3ubuntu10.24
 libtasn1-64.13-2
 libtiff54.0.9-5ubuntu0.2
 libtinfo56.1-1ubuntu1.18.04
-libudev1237-3ubuntu10.22
+libudev1237-3ubuntu10.24
 libunistring20.9.9-0ubuntu2
 libuuid12.31.1-0.4ubuntu3.3
 libwind0-heimdal7.5.0+dfsg-1
@@ -335,7 +335,7 @@ mount2.31.1-0.4ubuntu3.3
 multiarch-support2.27-3ubuntu1
 ncurses-base6.1-1ubuntu1.18.04
 ncurses-bin6.1-1ubuntu1.18.04
-openssl1.1.1-1ubuntu2.1~18.04.2
+openssl1.1.1-1ubuntu2.1~18.04.3
 passwd1:4.5-1ubuntu2
 patch2.7.6-2ubuntu1
 perl5.26.1-6ubuntu0.3
@@ -355,7 +355,7 @@ sensible-utils0.0.12
 sqlite33.22.0-1ubuntu0.1
 sysvinit-utils2.88dsf-59.10ubuntu1
 tar1.29b-2ubuntu0.1
-tzdata2019a-0ubuntu0.18.04
+tzdata2019b-0ubuntu0.18.04
 ubuntu-keyring2018.09.18.1~18.04.0
 ucf3.0038
 unzip6.0-21ubuntu1

readme-vars.yml

@@ -3,7 +3,7 @@
 # project information
 project_name: radarr
 project_url: "https://github.com/Radarr/Radarr"
-project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr.png"
+project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/radarr_alpha.png"
 project_blurb: |
   [{{ project_name|capitalize }}]({{ project_url }}) - A fork of Sonarr to work with movies à la Couchpotato.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"