Skip to content
This repository was archived by the owner on Apr 25, 2023. It is now read-only.

Commit 06ce4b6

Browse files
LinuxServer-CILinuxServer-CI
committed
Bot Updating Templated Files
1 parent 7255730 commit 06ce4b6

File tree

1 file changed

+14
-28
lines changed

1 file changed

+14
-28
lines changed

‎Jenkinsfile‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ pipeline {
431431
}
432432
steps {
433433
echo "Running on node: ${NODE_NAME}"
434-
sh "docker build \
434+
sh "docker buildx build \
435435
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
436436
--label \"org.opencontainers.image.authors=linuxserver.io\" \
437437
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-rdesktop-web/packages\" \
@@ -444,7 +444,7 @@ pipeline {
444444
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
445445
--label \"org.opencontainers.image.title=Baseimage-rdesktop-web\" \
446446
--label \"org.opencontainers.image.description=baseimage-rdesktop-web image by linuxserver.io\" \
447-
--no-cache --pull -t ${IMAGE}:${META_TAG} \
447+
--no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \
448448
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
449449
}
450450
}
@@ -461,7 +461,7 @@ pipeline {
461461
stage('Build X86') {
462462
steps {
463463
echo "Running on node: ${NODE_NAME}"
464-
sh "docker build \
464+
sh "docker buildx build \
465465
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
466466
--label \"org.opencontainers.image.authors=linuxserver.io\" \
467467
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-rdesktop-web/packages\" \
@@ -474,7 +474,7 @@ pipeline {
474474
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
475475
--label \"org.opencontainers.image.title=Baseimage-rdesktop-web\" \
476476
--label \"org.opencontainers.image.description=baseimage-rdesktop-web image by linuxserver.io\" \
477-
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} \
477+
--no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \
478478
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
479479
}
480480
}
@@ -488,7 +488,7 @@ pipeline {
488488
sh '''#! /bin/bash
489489
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
490490
'''
491-
sh "docker build \
491+
sh "docker buildx build \
492492
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
493493
--label \"org.opencontainers.image.authors=linuxserver.io\" \
494494
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-rdesktop-web/packages\" \
@@ -501,7 +501,7 @@ pipeline {
501501
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
502502
--label \"org.opencontainers.image.title=Baseimage-rdesktop-web\" \
503503
--label \"org.opencontainers.image.description=baseimage-rdesktop-web image by linuxserver.io\" \
504-
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} \
504+
--no-cache --pull -f Dockerfile.armhf -t ${IMAGE}:arm32v7-${META_TAG} --platform=linux/arm/v7 \
505505
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
506506
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
507507
retry(5) {
@@ -522,7 +522,7 @@ pipeline {
522522
sh '''#! /bin/bash
523523
echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin
524524
'''
525-
sh "docker build \
525+
sh "docker buildx build \
526526
--label \"org.opencontainers.image.created=${GITHUB_DATE}\" \
527527
--label \"org.opencontainers.image.authors=linuxserver.io\" \
528528
--label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-rdesktop-web/packages\" \
@@ -535,7 +535,7 @@ pipeline {
535535
--label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \
536536
--label \"org.opencontainers.image.title=Baseimage-rdesktop-web\" \
537537
--label \"org.opencontainers.image.description=baseimage-rdesktop-web image by linuxserver.io\" \
538-
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} \
538+
--no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \
539539
--build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ."
540540
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
541541
retry(5) {
@@ -564,26 +564,12 @@ pipeline {
564564
else
565565
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
566566
fi
567-
if [ "${DIST_IMAGE}" == "alpine" ]; then
568-
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
569-
apk info -v > /tmp/package_versions.txt && \
570-
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
571-
chmod 777 /tmp/package_versions.txt'
572-
elif [ "${DIST_IMAGE}" == "ubuntu" ]; then
573-
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
574-
apt list -qq --installed | sed "s#/.*now ##g" | cut -d" " -f1 > /tmp/package_versions.txt && \
575-
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
576-
chmod 777 /tmp/package_versions.txt'
577-
elif [ "${DIST_IMAGE}" == "fedora" ]; then
578-
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
579-
rpm -qa > /tmp/package_versions.txt && \
580-
sort -o /tmp/package_versions.txt /tmp/package_versions.txt && \
581-
chmod 777 /tmp/package_versions.txt'
582-
elif [ "${DIST_IMAGE}" == "arch" ]; then
583-
docker run --rm --entrypoint '/bin/sh' -v ${TEMPDIR}:/tmp ${LOCAL_CONTAINER} -c '\
584-
pacman -Q > /tmp/package_versions.txt && \
585-
chmod 777 /tmp/package_versions.txt'
586-
fi
567+
touch ${TEMPDIR}/package_versions.txt
568+
docker run --rm \
569+
-v /var/run/docker.sock:/var/run/docker.sock:ro \
570+
-v ${TEMPDIR}:/tmp \
571+
ghcr.io/anchore/syft:latest \
572+
${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt
587573
NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 )
588574
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
589575
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then

0 commit comments

Comments
 (0)