diff options
| -rwxr-xr-x | .github/workflows/permissions.yml | 2 | ||||
| -rw-r--r-- | Jenkinsfile | 12 | ||||
| -rwxr-xr-x | package_versions.txt | 16 |
3 files changed, 16 insertions, 14 deletions
diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 1447bc5..02e1bdb 100755 --- a/.github/workflows/permissions.yml +++ b/.github/workflows/permissions.yml @@ -5,6 +5,8 @@ on: - '**/run' - '**/finish' - '**/check' + - 'root/migrations/*' + jobs: permission_check: uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1 diff --git a/Jenkinsfile b/Jenkinsfile index d5b5016..b5dda02 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -255,7 +255,7 @@ pipeline { -v ${WORKSPACE}:/mnt \ -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - ghcr.io/linuxserver/baseimage-alpine:3.19 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ + ghcr.io/linuxserver/baseimage-alpine:3.20 s6-envdir -fn -- /var/run/s6/container_environment /bin/bash -c "\ apk add --no-cache python3 && \ python3 -m venv /lsiopy && \ pip install --no-cache-dir -U pip && \ @@ -362,7 +362,7 @@ pipeline { fi echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub" mkdir -p ${TEMPDIR}/docs - git clone https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation + git clone --depth=1 https://github.com/linuxserver/docker-documentation.git ${TEMPDIR}/docs/docker-documentation if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]] && [[ (! -f ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md) || ("$(md5sum ${TEMPDIR}/docs/docker-documentation/docs/images/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md | awk '{ print $1 }')") ]]; then cp ${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/docker-${CONTAINER_NAME}.md ${TEMPDIR}/docs/docker-documentation/docs/images/ cd ${TEMPDIR}/docs/docker-documentation @@ -380,8 +380,8 @@ pipeline { echo "Docs update not needed, skipping" fi mkdir -p ${TEMPDIR}/unraid - git clone https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates - git clone https://github.com/linuxserver/templates.git ${TEMPDIR}/unraid/templates + git clone --depth=1 https://github.com/linuxserver/docker-templates.git ${TEMPDIR}/unraid/docker-templates + git clone --depth=1 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 @@ -713,7 +713,7 @@ pipeline { set -e docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then - docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi docker run --rm \ @@ -804,7 +804,7 @@ 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:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 docker tag ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do diff --git a/package_versions.txt b/package_versions.txt index 7682a39..7bcf8f9 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -62,7 +62,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.1 deb libcrypt1 1:4.4.27-1 deb -libcups2 2.4.1op1-1ubuntu4.9 deb +libcups2 2.4.1op1-1ubuntu4.10 deb libcurl4 7.81.0-1ubuntu1.16 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdbus-1-3 1.12.20-2ubuntu4.1 deb @@ -120,8 +120,8 @@ libpng16-16 1.6.37-3build5 deb libprocps8 2:3.3.17-6ubuntu2.1 deb libpsl5 0.21.0-1.2build2 deb libpython3-stdlib 3.10.6-1~22.04 deb -libpython3.10-minimal 3.10.12-1~22.04.3 deb -libpython3.10-stdlib 3.10.12-1~22.04.3 deb +libpython3.10-minimal 3.10.12-1~22.04.4 deb +libpython3.10-stdlib 3.10.12-1~22.04.4 deb libreadline8 8.1.2-1 deb librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb @@ -136,7 +136,7 @@ libsmartcols1 2.37.2-4ubuntu3.4 deb libsqlite3-0 3.37.2-2ubuntu0.3 deb libss2 1.46.5-2ubuntu1.1 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb -libssl3 3.0.2-0ubuntu1.15 deb +libssl3 3.0.2-0ubuntu1.16 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.12 deb libtasn1-6 4.18.0-4build1 deb @@ -160,7 +160,7 @@ ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb openjdk-17-jre-headless 17.0.11+9-1~22.04.1 deb -openssl 3.0.2-0ubuntu1.15 deb +openssl 3.0.2-0ubuntu1.16 deb passwd 1:4.8.1-2ubuntu2.2 deb perl-base 5.34.0-3ubuntu1.3 deb pinentry-curses 1.1.1-1build2 deb @@ -168,14 +168,14 @@ procps 2:3.3.17-6ubuntu2.1 deb publicsuffix 20211207.1025-1 deb python3 3.10.6-1~22.04 deb python3-minimal 3.10.6-1~22.04 deb -python3.10 3.10.12-1~22.04.3 deb -python3.10-minimal 3.10.12-1~22.04.3 deb +python3.10 3.10.12-1~22.04.4 deb +python3.10-minimal 3.10.12-1~22.04.4 deb readline-common 8.1.2-1 deb sed 4.8-1ubuntu2 deb sensible-utils 0.0.17 deb sysvinit-utils 3.01-1ubuntu1 deb tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb -tzdata 2024a-0ubuntu0.22.04 deb +tzdata 2024a-0ubuntu0.22.04.1 deb ubuntu-keyring 2021.03.26 deb ucf 3.0043 deb unzip 6.0-26ubuntu3.2 deb |