Skip to content

Commit 86112c3

Browse files
thelamerthelamer
committed
Merge branch 'master' of github.com:linuxserver/docker-ffmpeg
2 parents 75ed844 + 23db2c6 commit 86112c3

File tree

2 files changed

+24
-43
lines changed

2 files changed

+24
-43
lines changed

‎Jenkinsfile‎

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ pipeline {
121121
steps {
122122
script{
123123
env.IMAGE = env.DOCKERHUB_IMAGE
124-
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
125124
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
126125
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
127126
if (env.MULTIARCH == 'true') {
@@ -142,7 +141,6 @@ pipeline {
142141
steps {
143142
script{
144143
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
145-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
146144
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
147145
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
148146
if (env.MULTIARCH == 'true') {
@@ -163,7 +161,6 @@ pipeline {
163161
steps {
164162
script{
165163
env.IMAGE = env.PR_DOCKERHUB_IMAGE
166-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
167164
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
168165
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
169166
if (env.MULTIARCH == 'true') {
@@ -528,22 +525,15 @@ pipeline {
528525
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
529526
usernameVariable: 'DOCKERUSER',
530527
passwordVariable: 'DOCKERPASS'
531-
],
532-
[
533-
$class: 'UsernamePasswordMultiBinding',
534-
credentialsId: 'Quay.io-Robot',
535-
usernameVariable: 'QUAYUSER',
536-
passwordVariable: 'QUAYPASS'
537528
]
538529
]) {
539530
retry(5) {
540531
sh '''#! /bin/bash
541532
set -e
542-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
543533
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
544534
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
545535
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
546-
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
536+
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
547537
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
548538
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
549539
docker push ${PUSHIMAGE}:latest
@@ -552,7 +542,7 @@ pipeline {
552542
'''
553543
}
554544
sh '''#! /bin/bash
555-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
545+
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
556546
docker rmi \
557547
${DELETEIMAGE}:${META_TAG} \
558548
${DELETEIMAGE}:latest || :
@@ -574,18 +564,11 @@ pipeline {
574564
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
575565
usernameVariable: 'DOCKERUSER',
576566
passwordVariable: 'DOCKERPASS'
577-
],
578-
[
579-
$class: 'UsernamePasswordMultiBinding',
580-
credentialsId: 'Quay.io-Robot',
581-
usernameVariable: 'QUAYUSER',
582-
passwordVariable: 'QUAYPASS'
583567
]
584568
]) {
585569
retry(5) {
586570
sh '''#! /bin/bash
587571
set -e
588-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
589572
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
590573
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
591574
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
@@ -619,26 +602,24 @@ pipeline {
619602
docker manifest push --purge ${MANIFESTIMAGE}:latest
620603
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
621604
done
622-
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
623-
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
624-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
625-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
626-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
627-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
628-
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
629-
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
630-
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
631-
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
632-
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
633-
docker push ${LEGACYIMAGE}:latest
634-
docker push ${LEGACYIMAGE}:${META_TAG}
635-
docker push ${LEGACYIMAGE}:arm32v7-latest
636-
docker push ${LEGACYIMAGE}:arm64v8-latest
637-
done
605+
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
606+
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
607+
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
608+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
609+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
610+
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
611+
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
612+
docker push ${GITHUBIMAGE}:amd64-${META_TAG}
613+
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
614+
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
615+
docker push ${GITHUBIMAGE}:latest
616+
docker push ${GITHUBIMAGE}:${META_TAG}
617+
docker push ${GITHUBIMAGE}:arm32v7-latest
618+
docker push ${GITHUBIMAGE}:arm64v8-latest
638619
'''
639620
}
640621
sh '''#! /bin/bash
641-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
622+
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
642623
docker rmi \
643624
${DELETEIMAGE}:amd64-${META_TAG} \
644625
${DELETEIMAGE}:amd64-latest \

‎package_versions.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ base-passwd3.5.44
66
bash4.4.18-2ubuntu1.2
77
bsdutils1:2.31.1-0.4ubuntu3.6
88
bzip21.0.6-8.1ubuntu0.2
9-
ca-certificates20180409
9+
ca-certificates20190110~18.04.1
1010
coreutils8.28-1ubuntu1
1111
curl7.58.0-2ubuntu3.8
1212
dash0.5.8-2.10
@@ -77,7 +77,7 @@ libhx509-5-heimdal7.5.0+dfsg-1
7777
libicu6060.2-3ubuntu3.1
7878
libidn2-02.0.4-1.1ubuntu0.2
7979
libjpeg88c-2ubuntu8
80-
libjpeg-turbo81.5.2-0ubuntu5.18.04.3
80+
libjpeg-turbo81.5.2-0ubuntu5.18.04.4
8181
libk5crypto31.16-2ubuntu0.1
8282
libkeyutils11.5.9-9.2ubuntu2
8383
libkrb5-26-heimdal7.5.0+dfsg-1
@@ -115,14 +115,14 @@ libsemanage-common2.7-2build2
115115
libsensors41:3.4.0-4
116116
libsepol12.7-1
117117
libsmartcols12.31.1-0.4ubuntu3.6
118-
libsqlite3-03.22.0-1ubuntu0.3
118+
libsqlite3-03.22.0-1ubuntu0.4
119119
libss21.44.1-1ubuntu1.3
120-
libssl1.11.1.1-1ubuntu2.1~18.04.5
120+
libssl1.11.1.1-1ubuntu2.1~18.04.6
121121
libstdc++68.4.0-1ubuntu1~18.04
122-
libsystemd0237-3ubuntu10.40
122+
libsystemd0237-3ubuntu10.41
123123
libtasn1-64.13-2
124124
libtinfo56.1-1ubuntu1.18.04
125-
libudev1237-3ubuntu10.40
125+
libudev1237-3ubuntu10.41
126126
libunistring20.9.9-0ubuntu2
127127
libuuid12.31.1-0.4ubuntu3.6
128128
libv4l-01.14.2-1
@@ -145,7 +145,7 @@ mount2.31.1-0.4ubuntu3.6
145145
multiarch-support2.27-3ubuntu1
146146
ncurses-base6.1-1ubuntu1.18.04
147147
ncurses-bin6.1-1ubuntu1.18.04
148-
openssl1.1.1-1ubuntu2.1~18.04.5
148+
openssl1.1.1-1ubuntu2.1~18.04.6
149149
passwd1:4.5-1ubuntu2
150150
perl-base5.26.1-6ubuntu0.3
151151
procps2:3.3.12-3ubuntu1.2

0 commit comments

Comments
 (0)