Merge branch 'master' into master-remove-armhf

This commit is contained in:
TheSpad 2023-02-13 09:08:05 +00:00
commit 962025a869
No known key found for this signature in database
GPG key ID: 08F06191F4587860
2 changed files with 12 additions and 4 deletions

8
Jenkinsfile vendored
View file

@ -778,6 +778,8 @@ pipeline {
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
if [ "${CI}" == "false" ]; then
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
fi
@ -785,6 +787,9 @@ pipeline {
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
@ -795,6 +800,9 @@ pipeline {
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
docker push ${MANIFESTIMAGE}:amd64-latest
docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
docker push ${MANIFESTIMAGE}:arm32v7-latest
docker push ${MANIFESTIMAGE}:arm32v7-${EXT_RELEASE_TAG}
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
docker push ${MANIFESTIMAGE}:arm64v8-latest
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}

View file

@ -16,9 +16,9 @@ debianutils5.5-1ubuntu2
diffutils1:3.8-0ubuntu2
dirmngr2.2.27-3ubuntu2.1
distro-info-data0.52ubuntu0.2
docker-ce5:23.0.0-1~ubuntu.22.04~jammy
docker-ce-cli5:23.0.0-1~ubuntu.22.04~jammy
docker-compose-plugin2.15.1-1~ubuntu.22.04~jammy
docker-ce5:23.0.1-1~ubuntu.22.04~jammy
docker-ce-cli5:23.0.1-1~ubuntu.22.04~jammy
docker-compose-plugin2.16.0-1~ubuntu.22.04~jammy
dpkg1.21.1ubuntu2.1
drm-info2.2.0-2
e2fsprogs1.46.5-2ubuntu1.1
@ -165,7 +165,7 @@ nodejs16.19.0-deb-1nodesource1
nvidia-container-toolkit1.12.0-1
nvidia-container-toolkit-base1.12.0-1
nvidia-docker22.12.0-1
openssl3.0.2-0ubuntu1.7
openssl3.0.2-0ubuntu1.8
passwd1:4.8.1-2ubuntu2.1
perl-base5.34.0-3ubuntu1.1
pigz2.6-1