From 377bb92a6d95785ebc453a5ec9b3ca5299553fe9 Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sat, 21 Sep 2019 08:51:26 -0700
Subject: [PATCH] bump to 4.2.1

---
 .github/FUNDING.yml |  1 +
 Dockerfile          |  2 +-
 Dockerfile.aarch64  |  2 +-
 Dockerfile.armhf    |  2 +-
 Jenkinsfile         | 17 ++++++++++++++---
 jenkins-vars.yml    |  2 +-
 6 files changed, 19 insertions(+), 7 deletions(-)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..7972213
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+open_collective: linuxserver
diff --git a/Dockerfile b/Dockerfile
index 022da6d..f8b4920 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ ENV \
 ENV \
  AOM=v1.0.0 \
  FDKAAC=0.1.5 \
- FFMPEG_HARD=4.2 \
+ FFMPEG_HARD=4.2.1 \
  FONTCONFIG=2.13.91 \
  FREETYPE=2.9.1 \
  FRIBIDI=0.19.7 \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 457a309..8776860 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -12,7 +12,7 @@ ENV \
 ENV \
  AOM=v1.0.0 \
  FDKAAC=0.1.5 \
- FFMPEG_HARD=4.2 \
+ FFMPEG_HARD=4.2.1 \
  FONTCONFIG=2.13.91 \
  FREETYPE=2.8.1 \
  FRIBIDI=0.19.7 \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index c93e7ea..b826d1f 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -12,7 +12,7 @@ ENV \
 ENV \
  AOM=v1.0.0 \
  FDKAAC=0.1.5 \
- FFMPEG_HARD=4.2 \
+ FFMPEG_HARD=4.2.1 \
  FONTCONFIG=2.13.91 \
  FREETYPE=2.8.1 \
  FRIBIDI=0.19.7 \
diff --git a/Jenkinsfile b/Jenkinsfile
index 96b0778..2f0b81f 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -50,6 +50,14 @@ pipeline {
                          echo none
                        fi''',
             returnStdout: true).trim()
+          env.FUNDING_TAG = sh(
+            script: '''#!/bin/bash
+                       if [ -e ./.github/FUNDING.yml ] ; then
+                         cat ./.github/FUNDING.yml | md5sum | cut -c1-8
+                       else
+                         echo none
+                       fi''',
+            returnStdout: true).trim()
         }
         script{
           env.LS_RELEASE_NUMBER = sh(
@@ -97,7 +105,7 @@ pipeline {
       steps{
         script{
           env.EXT_RELEASE = sh(
-            script: ''' echo 4.2 ''',
+            script: ''' echo 4.2.1 ''',
             returnStdout: true).trim()
             env.RELEASE_LINK = 'custom_command'
         }
@@ -217,15 +225,18 @@ pipeline {
               docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=bin -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
               if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \
                  [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \
-                 [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then
+                 [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ] || \
+                 [ "$(cat ${TEMPDIR}/${LS_REPO}/.github/FUNDING.yml | md5sum | cut -c1-8)" != "${FUNDING_TAG}" ]; then
                 mkdir -p ${TEMPDIR}/repo
                 git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                 git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f bin
                 cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
                 cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/
+                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
+                cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.github/FUNDING.yml ${TEMPDIR}/repo/${LS_REPO}/.github/FUNDING.yml
                 cd ${TEMPDIR}/repo/${LS_REPO}/
-                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE
+                git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git add Jenkinsfile README.md LICENSE ./.github/FUNDING.yml
                 git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git commit -m 'Bot Updating Templated Files'
                 git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git --all
                 echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER}
diff --git a/jenkins-vars.yml b/jenkins-vars.yml
index 1e3d2ab..8c68366 100644
--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -3,7 +3,7 @@
 # jenkins variables
 project_name: docker-ffmpeg
 external_type: na
-custom_version_command: "echo 4.2"
+custom_version_command: "echo 4.2.1"
 release_type: prerelease
 release_tag: bin
 ls_branch: bin