Compare commits
4 Commits
4.5.2-r2-l
...
4.5.3-r0-l
| Author | SHA1 | Date | |
|---|---|---|---|
|
65c38315eb | ||
|
|
5d49db1026 | ||
|
|
c33475d7ec | ||
|
|
14cea7736c |
@@ -19,10 +19,10 @@ XDG_DATA_HOME="/config"
|
||||
# install runtime packages and qbitorrent-cli
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --upgrade --virtual=build-dependencies \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
build-base && \
|
||||
echo "**** install packages ****" && \
|
||||
apk add -U --update --no-cache \
|
||||
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
||||
icu-libs \
|
||||
libstdc++ \
|
||||
openssl \
|
||||
|
||||
@@ -19,10 +19,10 @@ XDG_DATA_HOME="/config"
|
||||
# install runtime packages and qbitorrent-cli
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --upgrade --virtual=build-dependencies \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
build-base && \
|
||||
echo "**** install packages ****" && \
|
||||
apk add -U --update --no-cache \
|
||||
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
||||
icu-libs \
|
||||
libstdc++ \
|
||||
openssl \
|
||||
|
||||
@@ -19,10 +19,10 @@ XDG_DATA_HOME="/config"
|
||||
# install runtime packages and qbitorrent-cli
|
||||
RUN \
|
||||
echo "**** install build packages ****" && \
|
||||
apk add --no-cache --upgrade --virtual=build-dependencies \
|
||||
apk add --no-cache --virtual=build-dependencies \
|
||||
build-base && \
|
||||
echo "**** install packages ****" && \
|
||||
apk add -U --update --no-cache \
|
||||
apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
|
||||
icu-libs \
|
||||
libstdc++ \
|
||||
openssl \
|
||||
|
||||
121
Jenkinsfile
vendored
121
Jenkinsfile
vendored
@@ -42,7 +42,12 @@ pipeline {
|
||||
// Setup all the basic environment variables needed for the build
|
||||
stage("Set ENV Variables base"){
|
||||
steps{
|
||||
sh '''docker pull quay.io/skopeo/stable:v1 || : '''
|
||||
sh '''#! /bin/bash
|
||||
containers=$(docker ps -aq)
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
fi
|
||||
docker system prune -af --volumes || : '''
|
||||
script{
|
||||
env.EXIT_STATUS = ''
|
||||
env.LS_RELEASE = sh(
|
||||
@@ -208,12 +213,12 @@ pipeline {
|
||||
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
|
||||
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
|
||||
if (env.MULTIARCH == 'true') {
|
||||
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
||||
env.CI_TAGS = 'amd64-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm32v7-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
} else {
|
||||
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
||||
env.CI_TAGS = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
}
|
||||
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
||||
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-pr-' + env.PULL_REQUEST
|
||||
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
env.META_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
|
||||
env.EXT_RELEASE_TAG = 'version-' + env.EXT_RELEASE_CLEAN
|
||||
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
|
||||
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
|
||||
@@ -341,6 +346,8 @@ pipeline {
|
||||
git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates
|
||||
if [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-logo.png ]]; then
|
||||
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-logo.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
||||
elif [[ -f ${TEMPDIR}/unraid/docker-templates/linuxserver.io/img/${CONTAINER_NAME}-icon.png ]]; then
|
||||
sed -i "s|master/linuxserver.io/img/linuxserver-ls-logo.png|master/linuxserver.io/img/${CONTAINER_NAME}-icon.png|" ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml
|
||||
fi
|
||||
if [[ ("${BRANCH_NAME}" == "master") || ("${BRANCH_NAME}" == "main") ]] && [[ (! -f ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml) || ("$(md5sum ${TEMPDIR}/unraid/templates/unraid/${CONTAINER_NAME}.xml | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/${CONTAINER_NAME}.xml | awk '{ print $1 }')") ]]; then
|
||||
cd ${TEMPDIR}/unraid/templates/
|
||||
@@ -432,8 +439,7 @@ pipeline {
|
||||
}
|
||||
steps{
|
||||
sh '''#! /bin/bash
|
||||
set -e
|
||||
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/qbittorrent") | .uuid')
|
||||
PACKAGE_UUID=$(curl -X GET -H "Authorization: Bearer ${SCARF_TOKEN}" https://scarf.sh/api/v1/organizations/linuxserver-ci/packages | jq -r '.[] | select(.name=="linuxserver/qbittorrent") | .uuid' || :)
|
||||
if [ -z "${PACKAGE_UUID}" ]; then
|
||||
echo "Adding package to Scarf.sh"
|
||||
curl -sX POST https://scarf.sh/api/v1/organizations/linuxserver-ci/packages \
|
||||
@@ -543,9 +549,12 @@ pipeline {
|
||||
retry(5) {
|
||||
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||
}
|
||||
sh '''docker rmi \
|
||||
${IMAGE}:arm32v7-${META_TAG} \
|
||||
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
|
||||
sh '''#! /bin/bash
|
||||
containers=$(docker ps -aq)
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
fi
|
||||
docker system prune -af --volumes || : '''
|
||||
}
|
||||
}
|
||||
stage('Build ARM64') {
|
||||
@@ -578,9 +587,12 @@ pipeline {
|
||||
retry(5) {
|
||||
sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}"
|
||||
}
|
||||
sh '''docker rmi \
|
||||
${IMAGE}:arm64v8-${META_TAG} \
|
||||
ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :'''
|
||||
sh '''#! /bin/bash
|
||||
containers=$(docker ps -aq)
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
fi
|
||||
docker system prune -af --volumes || : '''
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -641,13 +653,6 @@ pipeline {
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
echo "Packages were updated. Cleaning up the image and exiting."
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
fi'''
|
||||
script{
|
||||
env.EXIT_STATUS = 'ABORTED'
|
||||
}
|
||||
@@ -665,13 +670,6 @@ pipeline {
|
||||
}
|
||||
}
|
||||
steps {
|
||||
sh '''#! /bin/bash
|
||||
echo "There are no package updates. Cleaning up the image and exiting."
|
||||
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
|
||||
docker rmi ${IMAGE}:amd64-${META_TAG}
|
||||
else
|
||||
docker rmi ${IMAGE}:${META_TAG}
|
||||
fi'''
|
||||
script{
|
||||
env.EXIT_STATUS = 'ABORTED'
|
||||
}
|
||||
@@ -772,17 +770,6 @@ pipeline {
|
||||
done
|
||||
'''
|
||||
}
|
||||
sh '''#! /bin/bash
|
||||
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
|
||||
docker rmi \
|
||||
${DELETEIMAGE}:${META_TAG} \
|
||||
${DELETEIMAGE}:${EXT_RELEASE_TAG} \
|
||||
${DELETEIMAGE}:latest || :
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker rmi ${DELETEIMAGE}:${SEMVER} || :
|
||||
fi
|
||||
done
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -876,29 +863,6 @@ pipeline {
|
||||
done
|
||||
'''
|
||||
}
|
||||
sh '''#! /bin/bash
|
||||
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
|
||||
docker rmi \
|
||||
${DELETEIMAGE}:amd64-${META_TAG} \
|
||||
${DELETEIMAGE}:amd64-latest \
|
||||
${DELETEIMAGE}:amd64-${EXT_RELEASE_TAG} \
|
||||
${DELETEIMAGE}:arm32v7-${META_TAG} \
|
||||
${DELETEIMAGE}:arm32v7-latest \
|
||||
${DELETEIMAGE}:arm32v7-${EXT_RELEASE_TAG} \
|
||||
${DELETEIMAGE}:arm64v8-${META_TAG} \
|
||||
${DELETEIMAGE}:arm64v8-latest \
|
||||
${DELETEIMAGE}:arm64v8-${EXT_RELEASE_TAG} || :
|
||||
if [ -n "${SEMVER}" ]; then
|
||||
docker rmi \
|
||||
${DELETEIMAGE}:amd64-${SEMVER} \
|
||||
${DELETEIMAGE}:arm32v7-${SEMVER} \
|
||||
${DELETEIMAGE}:arm64v8-${SEMVER} || :
|
||||
fi
|
||||
done
|
||||
docker rmi \
|
||||
ghcr.io/linuxserver/lsiodev-buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
|
||||
ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || :
|
||||
'''
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -969,7 +933,6 @@ pipeline {
|
||||
stage('Pull Request Comment') {
|
||||
when {
|
||||
not {environment name: 'CHANGE_ID', value: ''}
|
||||
environment name: 'CI', value: 'true'
|
||||
environment name: 'EXIT_STATUS', value: ''
|
||||
}
|
||||
steps {
|
||||
@@ -1023,16 +986,24 @@ pipeline {
|
||||
echo "$escaped_table"
|
||||
}
|
||||
|
||||
# Retrieve JSON data from URL
|
||||
data=$(get_json "$CI_JSON_URL")
|
||||
# Create table from JSON data
|
||||
table=$(build_table "$data")
|
||||
echo -e "$table"
|
||||
if [[ "${CI}" = "true" ]]; then
|
||||
# Retrieve JSON data from URL
|
||||
data=$(get_json "$CI_JSON_URL")
|
||||
# Create table from JSON data
|
||||
table=$(build_table "$data")
|
||||
echo -e "$table"
|
||||
|
||||
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
||||
-d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"'''
|
||||
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
||||
-d "{\\"body\\": \\"I am a bot, here are the test results for this PR: \\n${CI_URL}\\n${SHELLCHECK_URL}\\n${table}\\"}"
|
||||
else
|
||||
curl -X POST -H "Authorization: token $GITHUB_TOKEN" \
|
||||
-H "Accept: application/vnd.github.v3+json" \
|
||||
"https://api.github.com/repos/$LS_USER/$LS_REPO/issues/$PULL_REQUEST/comments" \
|
||||
-d "{\\"body\\": \\"I am a bot, here is the pushed image/manifest for this PR: \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}"
|
||||
fi
|
||||
'''
|
||||
|
||||
}
|
||||
}
|
||||
@@ -1059,6 +1030,14 @@ pipeline {
|
||||
}
|
||||
}
|
||||
cleanup {
|
||||
sh '''#! /bin/bash
|
||||
echo "Performing docker system prune!!"
|
||||
containers=$(docker ps -aq)
|
||||
if [[ -n "${containers}" ]]; then
|
||||
docker stop ${containers}
|
||||
fi
|
||||
docker system prune -af --volumes || :
|
||||
'''
|
||||
cleanWs()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -88,56 +88,56 @@ alpine-baselayout 3
|
||||
alpine-baselayout-data 3.4.3-r1 apk
|
||||
alpine-keys 2.4-r1 apk
|
||||
apk-tools 2.14.0-r5 apk
|
||||
bash 5.2.15-r3 apk
|
||||
bash 5.2.15-r5 apk
|
||||
brotli-libs 1.0.9-r15 apk
|
||||
busybox 1.36.0 binary
|
||||
busybox 1.36.0-r11 apk
|
||||
busybox-binsh 1.36.0-r11 apk
|
||||
c-ares 1.19.0-r4 apk
|
||||
busybox 1.36.1 binary
|
||||
busybox 1.36.1-r0 apk
|
||||
busybox-binsh 1.36.1-r0 apk
|
||||
c-ares 1.19.1-r1 apk
|
||||
ca-certificates 20230506-r0 apk
|
||||
ca-certificates-bundle 20230506-r0 apk
|
||||
coreutils 9.3-r2 apk
|
||||
coreutils-env 9.3-r2 apk
|
||||
curl 8.1.0-r2 apk
|
||||
curl 8.1.1-r1 apk
|
||||
dbus-libs 1.14.6-r3 apk
|
||||
double-conversion 3.2.1-r1 apk
|
||||
gdbm 1.23-r1 apk
|
||||
glib 2.76.2-r1 apk
|
||||
glib 2.76.3-r0 apk
|
||||
icu-data-en 73.1-r2 apk
|
||||
icu-libs 73.1-r2 apk
|
||||
jq 1.6-r3 apk
|
||||
libacl 2.3.1-r4 apk
|
||||
libattr 2.5.1-r5 apk
|
||||
libb2 0.98.1-r3 apk
|
||||
libblkid 2.39-r0 apk
|
||||
libblkid 2.39-r6 apk
|
||||
libbsd 0.11.7-r2 apk
|
||||
libbz2 1.0.8-r6 apk
|
||||
libc-utils 0.7.2-r5 apk
|
||||
libcrypto1.1 1.1.1t-r3 apk
|
||||
libcrypto3 3.1.0-r5 apk
|
||||
libcurl 8.1.0-r2 apk
|
||||
libcurl 8.1.1-r1 apk
|
||||
libexpat 2.5.0-r2 apk
|
||||
libffi 3.4.4-r3 apk
|
||||
libgcc 13.1.1_git20230513-r2 apk
|
||||
libgomp 13.1.1_git20230513-r2 apk
|
||||
libgcc 13.1.1_git20230527-r1 apk
|
||||
libgomp 13.1.1_git20230527-r1 apk
|
||||
libidn2 2.3.4-r2 apk
|
||||
libintl 0.21.1-r9 apk
|
||||
libmd 1.0.4-r2 apk
|
||||
libmount 2.39-r0 apk
|
||||
libncursesw 6.4_p20230514-r0 apk
|
||||
libpanelw 6.4_p20230514-r0 apk
|
||||
libmount 2.39-r6 apk
|
||||
libncursesw 6.4_p20230527-r0 apk
|
||||
libpanelw 6.4_p20230527-r0 apk
|
||||
libpcre2-16 10.42-r1 apk
|
||||
libproc2 4.0.3-r2 apk
|
||||
libssl1.1 1.1.1t-r3 apk
|
||||
libssl3 3.1.0-r5 apk
|
||||
libstdc++ 13.1.1_git20230513-r2 apk
|
||||
libtorrent-rasterbar 2.0.8-r3 apk
|
||||
libstdc++ 13.1.1_git20230527-r1 apk
|
||||
libtorrent-rasterbar 2.0.9-r0 apk
|
||||
libunistring 1.1-r2 apk
|
||||
linux-pam 1.5.3-r1 apk
|
||||
mpdecimal 2.5.1-r2 apk
|
||||
musl 1.2.4-r0 apk
|
||||
musl-utils 1.2.4-r0 apk
|
||||
ncurses-terminfo-base 6.4_p20230514-r0 apk
|
||||
ncurses-terminfo-base 6.4_p20230527-r0 apk
|
||||
netcat-openbsd 1.219-r1 apk
|
||||
nghttp2-libs 1.53.0-r1 apk
|
||||
oniguruma 6.9.8-r1 apk
|
||||
@@ -150,9 +150,9 @@ python 3
|
||||
python3 3.11.3-r11 apk
|
||||
python3-pyc 3.11.3-r11 apk
|
||||
python3-pycache-pyc0 3.11.3-r11 apk
|
||||
qbittorrent-nox 4.5.2-r2 apk
|
||||
qt6-qtbase 6.5.0-r4 apk
|
||||
qt6-qtbase-sqlite 6.5.0-r4 apk
|
||||
qbittorrent-nox 4.5.3-r0 apk
|
||||
qt6-qtbase 6.5.1-r0 apk
|
||||
qt6-qtbase-sqlite 6.5.1-r0 apk
|
||||
readline 8.2.1-r2 apk
|
||||
runtime.any.System.Collections 4.3.0 dotnet
|
||||
runtime.any.System.Diagnostics.Tools 4.3.0 dotnet
|
||||
@@ -199,7 +199,7 @@ scanelf 1
|
||||
shadow 4.13-r2 apk
|
||||
skalibs 2.13.1.1-r2 apk
|
||||
sqlite-libs 3.42.0-r0 apk
|
||||
ssl_client 1.36.0-r11 apk
|
||||
ssl_client 1.36.1-r0 apk
|
||||
tzdata 2023c-r1 apk
|
||||
utmps-libs 0.1.2.1-r2 apk
|
||||
xz-libs 5.4.3-r1 apk
|
||||
|
||||
Reference in New Issue
Block a user