LAB-linuxserver/docker-ffmpeg
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-ffmpeg.git synced 2026-02-20 04:56:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

bump to 4.2.1

Browse Source
This commit is contained in:
thelamer 2019-09-21 08:51:26 -07:00
parent 8452f67f82
commit 377bb92a6d
6 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/FUNDING.yml vendored Normal file
View File

@ -0,0 +1 @@
open_collective: linuxserver

2
Dockerfile
View File

@ -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 \

2
Dockerfile.aarch64
View File

@ -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 \

2
Dockerfile.armhf
View File

@ -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 \

17
Jenkinsfile vendored
View File

@ -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}

2
jenkins-vars.yml
View File

@ -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