From 02df6e750f260d7a6f030fd8177ef3d24acaa641 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 5 Mar 2024 23:27:00 +0000 Subject: [PATCH 01/72] Bot Updating Package Versions --- package_versions.txt | 292 +++++++++++++++++++++---------------------- 1 file changed, 146 insertions(+), 146 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 44a756b5..f3cc130f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,146 +1,146 @@ -NAME VERSION TYPE -adduser 3.118ubuntu5 deb -apt 2.4.11 deb -apt-utils 2.4.11 deb -base-files 12ubuntu4.3 deb -base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1 deb -bash 5.1.16 binary -bsdutils 1:2.37.2-4ubuntu3 deb -ca-certificates 20230311ubuntu0.22.04.1 deb -coreutils 8.32-4.1ubuntu1 deb -cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.15 deb -dash 0.5.11+git20210903+057cd650a4ed-3build1 deb -debconf 1.5.79ubuntu1 deb -debianutils 5.5-1ubuntu2 deb -diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.1 deb -dpkg 1.21.1ubuntu2.2 deb -e2fsprogs 1.46.5-2ubuntu1.1 deb -findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.1.0-2ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.1 deb -gnupg-l10n 2.2.27-3ubuntu2.1 deb -gnupg-utils 2.2.27-3ubuntu2.1 deb -gpg 2.2.27-3ubuntu2.1 deb -gpg-agent 2.2.27-3ubuntu2.1 deb -gpg-wks-client 2.2.27-3ubuntu2.1 deb -gpg-wks-server 2.2.27-3ubuntu2.1 deb -gpgconf 2.2.27-3ubuntu2.1 deb -gpgsm 2.2.27-3ubuntu2.1 deb -gpgv 2.2.27-3ubuntu2.1 deb -grep 3.7-1build1 deb -gzip 1.10-4ubuntu4.1 deb -hostname 3.23ubuntu2 deb -init-system-helpers 1.62 deb -jq 1.6-2.1ubuntu3 deb -libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.11 deb -libassuan0 2.5.5-1build1 deb -libattr1 1:2.5.1-1build1 deb -libaudit-common 1:3.0.7-1build1 deb -libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3 deb -libbrotli1 1.0.9-2build6 deb -libbsd0 0.11.5-1 deb -libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.1 deb -libc6 2.35-0ubuntu3.1 deb -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 -libcurl4 7.81.0-1ubuntu1.15 deb -libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb -libdebconfclient0 0.261ubuntu1 deb -libext2fs2 1.46.5-2ubuntu1.1 deb -libffi8 3.4.2-4 deb -libgcc-s1 12.1.0-2ubuntu1~22.04 deb -libgcrypt20 1.9.4-3ubuntu3 deb -libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.2 deb -libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb -libhogweed6 3.7.3-1build2 deb -libidn2-0 2.3.2-2build1 deb -libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.2 deb -libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.2 deb -libkrb5support0 1.19.2-2ubuntu0.2 deb -libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.2 deb -libldap-common 2.5.16+dfsg-0ubuntu0.22.04.2 deb -liblz4-1 1.9.3-2build2 deb -liblzma5 5.2.5-2ubuntu1 deb -libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3 deb -libncurses6 6.3-2ubuntu0.1 deb -libncursesw6 6.3-2ubuntu0.1 deb -libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1ubuntu0.1 deb -libnpth0 1.6-3build2 deb -libnsl2 1.3.0-2build2 deb -libonig5 6.9.7.1-2build1 deb -libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.3 deb -libpam-modules-bin 1.4.0-11ubuntu2.3 deb -libpam-runtime 1.4.0-11ubuntu2.3 deb -libpam0g 1.4.0-11ubuntu2.3 deb -libpcre2-8-0 10.39-3ubuntu0.1 deb -libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2 deb -libpsl5 0.21.0-1.2build2 deb -libreadline8 8.1.2-1 deb -librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb -libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb -libseccomp2 2.5.3-2ubuntu2 deb -libselinux1 3.3-1build2 deb -libsemanage-common 3.3-1build2 deb -libsemanage2 3.3-1build2 deb -libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3 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.10 deb -libstdc++6 12.1.0-2ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.9 deb -libtasn1-6 4.18.0-4build1 deb -libtinfo6 6.3-2ubuntu0.1 deb -libtirpc-common 1.3.2-2ubuntu0.1 deb -libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.9 deb -libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3 deb -libxxhash0 0.8.1-1 deb -libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.6 deb -login 1:4.8.1-2ubuntu2.1 deb -logsave 1.46.5-2ubuntu1.1 deb -lsb-base 11.1.0ubuntu4 deb -mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3 deb -ncurses-base 6.3-2ubuntu0.1 deb -ncurses-bin 6.3-2ubuntu0.1 deb -netcat 1.218-4ubuntu1 deb -netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.15 deb -passwd 1:4.8.1-2ubuntu2.1 deb -perl-base 5.34.0-3ubuntu1.2 deb -pinentry-curses 1.1.1-1build2 deb -procps 2:3.3.17-6ubuntu2 deb -publicsuffix 20211207.1025-1 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.1 deb -tzdata 2023d-0ubuntu0.22.04 deb -ubuntu-keyring 2021.03.26 deb -usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3 deb -zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb +NAME VERSION TYPE +adduser 3.118ubuntu5 deb +apt 2.4.11 deb +apt-utils 2.4.11 deb +base-files 12ubuntu4.3 deb +base-passwd 3.5.52build1 deb +bash 5.1-6ubuntu1 deb +bash 5.1.16 binary +bsdutils 1:2.37.2-4ubuntu3 deb +ca-certificates 20230311ubuntu0.22.04.1 deb +coreutils 8.32-4.1ubuntu1 deb +cron 3.0pl1-137ubuntu3 deb +curl 7.81.0-1ubuntu1.15 deb +dash 0.5.11+git20210903+057cd650a4ed-3build1 deb +debconf 1.5.79ubuntu1 deb +debianutils 5.5-1ubuntu2 deb +diffutils 1:3.8-0ubuntu2 deb +dirmngr 2.2.27-3ubuntu2.1 deb +dpkg 1.21.1ubuntu2.2 deb +e2fsprogs 1.46.5-2ubuntu1.1 deb +findutils 4.8.0-1ubuntu3 deb +gcc-12-base 12.1.0-2ubuntu1~22.04 deb +gnupg 2.2.27-3ubuntu2.1 deb +gnupg-l10n 2.2.27-3ubuntu2.1 deb +gnupg-utils 2.2.27-3ubuntu2.1 deb +gpg 2.2.27-3ubuntu2.1 deb +gpg-agent 2.2.27-3ubuntu2.1 deb +gpg-wks-client 2.2.27-3ubuntu2.1 deb +gpg-wks-server 2.2.27-3ubuntu2.1 deb +gpgconf 2.2.27-3ubuntu2.1 deb +gpgsm 2.2.27-3ubuntu2.1 deb +gpgv 2.2.27-3ubuntu2.1 deb +grep 3.7-1build1 deb +gzip 1.10-4ubuntu4.1 deb +hostname 3.23ubuntu2 deb +init-system-helpers 1.62 deb +jq 1.6-2.1ubuntu3 deb +libacl1 2.3.1-1 deb +libapt-pkg6.0 2.4.11 deb +libassuan0 2.5.5-1build1 deb +libattr1 1:2.5.1-1build1 deb +libaudit-common 1:3.0.7-1build1 deb +libaudit1 1:3.0.7-1build1 deb +libblkid1 2.37.2-4ubuntu3 deb +libbrotli1 1.0.9-2build6 deb +libbsd0 0.11.5-1 deb +libbz2-1.0 1.0.8-5build1 deb +libc-bin 2.35-0ubuntu3.1 deb +libc6 2.35-0ubuntu3.1 deb +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 +libcurl4 7.81.0-1ubuntu1.15 deb +libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb +libdebconfclient0 0.261ubuntu1 deb +libext2fs2 1.46.5-2ubuntu1.1 deb +libffi8 3.4.2-4 deb +libgcc-s1 12.1.0-2ubuntu1~22.04 deb +libgcrypt20 1.9.4-3ubuntu3 deb +libgmp10 2:6.2.1+dfsg-3ubuntu1 deb +libgnutls30 3.7.3-4ubuntu1.2 deb +libgpg-error0 1.43-3 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb +libhogweed6 3.7.3-1build2 deb +libidn2-0 2.3.2-2build1 deb +libjq1 1.6-2.1ubuntu3 deb +libk5crypto3 1.19.2-2ubuntu0.2 deb +libkeyutils1 1.6.1-2ubuntu3 deb +libkrb5-3 1.19.2-2ubuntu0.2 deb +libkrb5support0 1.19.2-2ubuntu0.2 deb +libksba8 1.6.0-2ubuntu0.2 deb +libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.2 deb +libldap-common 2.5.16+dfsg-0ubuntu0.22.04.2 deb +liblz4-1 1.9.3-2build2 deb +liblzma5 5.2.5-2ubuntu1 deb +libmd0 1.0.4-1build1 deb +libmount1 2.37.2-4ubuntu3 deb +libncurses6 6.3-2ubuntu0.1 deb +libncursesw6 6.3-2ubuntu0.1 deb +libnettle8 3.7.3-1build2 deb +libnghttp2-14 1.43.0-1ubuntu0.1 deb +libnpth0 1.6-3build2 deb +libnsl2 1.3.0-2build2 deb +libonig5 6.9.7.1-2build1 deb +libp11-kit0 0.24.0-6build1 deb +libpam-modules 1.4.0-11ubuntu2.3 deb +libpam-modules-bin 1.4.0-11ubuntu2.3 deb +libpam-runtime 1.4.0-11ubuntu2.3 deb +libpam0g 1.4.0-11ubuntu2.3 deb +libpcre2-8-0 10.39-3ubuntu0.1 deb +libpcre3 2:8.39-13ubuntu0.22.04.1 deb +libprocps8 2:3.3.17-6ubuntu2 deb +libpsl5 0.21.0-1.2build2 deb +libreadline8 8.1.2-1 deb +librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb +libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb +libseccomp2 2.5.3-2ubuntu2 deb +libselinux1 3.3-1build2 deb +libsemanage-common 3.3-1build2 deb +libsemanage2 3.3-1build2 deb +libsepol2 3.3-1build1 deb +libsmartcols1 2.37.2-4ubuntu3 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.10 deb +libstdc++6 12.1.0-2ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.9 deb +libtasn1-6 4.18.0-4build1 deb +libtinfo6 6.3-2ubuntu0.1 deb +libtirpc-common 1.3.2-2ubuntu0.1 deb +libtirpc3 1.3.2-2ubuntu0.1 deb +libudev1 249.11-0ubuntu3.9 deb +libunistring2 1.0-1 deb +libuuid1 2.37.2-4ubuntu3 deb +libxxhash0 0.8.1-1 deb +libzstd1 1.4.8+dfsg-3build1 deb +locales 2.35-0ubuntu3.6 deb +login 1:4.8.1-2ubuntu2.1 deb +logsave 1.46.5-2ubuntu1.1 deb +lsb-base 11.1.0ubuntu4 deb +mawk 1.3.4.20200120-3 deb +mount 2.37.2-4ubuntu3 deb +ncurses-base 6.3-2ubuntu0.1 deb +ncurses-bin 6.3-2ubuntu0.1 deb +netcat 1.218-4ubuntu1 deb +netcat-openbsd 1.218-4ubuntu1 deb +openssl 3.0.2-0ubuntu1.15 deb +passwd 1:4.8.1-2ubuntu2.1 deb +perl-base 5.34.0-3ubuntu1.2 deb +pinentry-curses 1.1.1-1build2 deb +procps 2:3.3.17-6ubuntu2 deb +publicsuffix 20211207.1025-1 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.1 deb +tzdata 2024a-0ubuntu0.22.04 deb +ubuntu-keyring 2021.03.26 deb +usrmerge 25ubuntu2 deb +util-linux 2.37.2-4ubuntu3 deb +zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From 2b6530ec48a1fd6d4369db415dc031600fe45af3 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 12 Mar 2024 23:27:05 +0000 Subject: [PATCH 02/72] Bot Updating Templated Files --- Jenkinsfile | 58 ++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 42 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4770d517..64cf4c0d 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -266,8 +266,15 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=jammy -v ${TEMPDIR}:/ansible/jenkins ghcr.io/linuxserver/jenkins-builder:latest - # Stage 1 - Jenkinsfile update + # Cloned repo paths for templating: + # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch jammy of ${LS_USER}/${LS_REPO} for running the jenkins builder on + # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch jammy of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github + # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github + # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos + # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github + git clone --branch jammy --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} + docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest + echo "Starting Stage 1 - Jenkinsfile update" if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} @@ -279,13 +286,13 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile" + echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} exit 0 else echo "Jenkinsfile is up to date." fi - # Stage 2 - Delete old templates + echo "Starting Stage 2 - Delete old templates" OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then @@ -304,13 +311,13 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old and deprecated templates" + echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} exit 0 else echo "No templates to delete" fi - # Stage 3 - Update templates + echo "Starting Stage 3 - Update templates" CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) cd ${TEMPDIR}/docker-${CONTAINER_NAME} NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) @@ -334,9 +341,14 @@ pipeline { git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "Updating templates and exiting build, new one will trigger based on commit" + rm -Rf ${TEMPDIR} + exit 0 else echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} + echo "No templates to update" 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 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 @@ -344,6 +356,7 @@ pipeline { cd ${TEMPDIR}/docs/docker-documentation GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') git add docs/images/docker-${CONTAINER_NAME}.md + echo "Updating docs repo" git commit -m 'Bot Updating Documentation' git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \ @@ -351,16 +364,27 @@ pipeline { sleep $((RANDOM % MAXWAIT)) && \ git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \ git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}) + else + echo "Docs update not needed, skipping" fi - # Stage 4 - Sync Readme to Docker Hub if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then - if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) > 25000 ]]; then + if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" else echo "Syncing readme to Docker Hub" DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" fi + if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then + echo "Docker Hub endpoint doesn't exist. Creating endpoint first." + DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') + curl -s \ + -H "Authorization: JWT ${DH_TOKEN}" \ + -H "Content-Type: application/json" \ + -X POST \ + -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \ + https://hub.docker.com/v2/repositories/ || : + fi DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') curl -s \ -H "Authorization: JWT ${DH_TOKEN}" \ @@ -425,14 +449,16 @@ pipeline { } steps{ sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \ - -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ - "name":"'${LS_REPO}'", - "mirror":true,\ - "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ - "issues_access_level":"disabled",\ - "merge_requests_access_level":"disabled",\ - "repository_access_level":"enabled",\ - "visibility":"public"}' ''' + -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ + "name":"'${LS_REPO}'", + "mirror":true,\ + "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ + "issues_access_level":"disabled",\ + "merge_requests_access_level":"disabled",\ + "repository_access_level":"enabled",\ + "visibility":"public"}' ''' + sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \ + -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" ''' } } /* ############### From ba23dac60a1cbad776261ee2fcb329b0e58d2d2e Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 19 Mar 2024 14:59:53 +0000 Subject: [PATCH 03/72] Run apt-upgrade during build --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 82196916..e33d648c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -105,6 +105,7 @@ RUN \ > /run/systemd/container && \ echo "**** install apt-utils and locales ****" && \ apt-get update && \ + apt-get upgrade -y && \ apt-get install -y \ apt-utils \ locales && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index c788e0de..a38ee04f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -105,6 +105,7 @@ RUN \ > /run/systemd/container && \ echo "**** install apt-utils and locales ****" && \ apt-get update && \ + apt-get upgrade -y && \ apt-get install -y \ apt-utils \ locales && \ From 397422a8247fe6ec99797b13cdb9173c66397ce1 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 19 Mar 2024 15:00:07 +0000 Subject: [PATCH 04/72] Bump s6 to 3.1.6.2 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e33d648c..0b2cb7c4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ RUN \ /root-out/var/log/* # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.5.0" +ARG S6_OVERLAY_VERSION="3.1.6.2" ARG S6_OVERLAY_ARCH="x86_64" # add s6 overlay diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index a38ee04f..bac994aa 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -27,7 +27,7 @@ RUN \ /root-out/var/log/* # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.5.0" +ARG S6_OVERLAY_VERSION="3.1.6.2" ARG S6_OVERLAY_ARCH="aarch64" # add s6 overlay From ef14251070513496b6660942ec2202695e05b991 Mon Sep 17 00:00:00 2001 From: TheSpad Date: Tue, 19 Mar 2024 15:01:48 +0000 Subject: [PATCH 05/72] Make jammy the stable release --- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 64cf4c0d..cc6e107b 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -837,7 +837,7 @@ pipeline { "target_commitish": "jammy",\ "name": "'${META_TAG}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": true}' >> releasebody.json + printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index a373adf0..85d46168 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-baseimage-ubuntu external_type: os -release_type: prerelease +release_type: stable release_tag: jammy ls_branch: jammy repo_vars: From 2b09c1043ca27deb891e21bda4fe79d52e6612cb Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 19 Mar 2024 15:57:23 +0000 Subject: [PATCH 06/72] Bot Updating Package Versions --- package_versions.txt | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f3cc130f..c6f76704 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -2,13 +2,13 @@ NAME VERSION TYPE adduser 3.118ubuntu5 deb apt 2.4.11 deb apt-utils 2.4.11 deb -base-files 12ubuntu4.3 deb +base-files 12ubuntu4.6 deb base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1 deb +bash 5.1-6ubuntu1.1 deb bash 5.1.16 binary bsdutils 1:2.37.2-4ubuntu3 deb ca-certificates 20230311ubuntu0.22.04.1 deb -coreutils 8.32-4.1ubuntu1 deb +coreutils 8.32-4.1ubuntu1.1 deb cron 3.0pl1-137ubuntu3 deb curl 7.81.0-1ubuntu1.15 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb @@ -16,10 +16,10 @@ debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb diffutils 1:3.8-0ubuntu2 deb dirmngr 2.2.27-3ubuntu2.1 deb -dpkg 1.21.1ubuntu2.2 deb +dpkg 1.21.1ubuntu2.3 deb e2fsprogs 1.46.5-2ubuntu1.1 deb findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.1.0-2ubuntu1~22.04 deb +gcc-12-base 12.3.0-1ubuntu1~22.04 deb gnupg 2.2.27-3ubuntu2.1 deb gnupg-l10n 2.2.27-3ubuntu2.1 deb gnupg-utils 2.2.27-3ubuntu2.1 deb @@ -45,8 +45,8 @@ libblkid1 2.37.2-4ubuntu3 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.1 deb -libc6 2.35-0ubuntu3.1 deb +libc-bin 2.35-0ubuntu3.6 deb +libc6 2.35-0ubuntu3.6 deb 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 @@ -56,22 +56,22 @@ libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.1 deb libffi8 3.4.2-4 deb -libgcc-s1 12.1.0-2ubuntu1~22.04 deb +libgcc-s1 12.3.0-1ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.2 deb +libgnutls30 3.7.3-4ubuntu1.4 deb libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.2 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb libhogweed6 3.7.3-1build2 deb libidn2-0 2.3.2-2build1 deb libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.2 deb +libk5crypto3 1.19.2-2ubuntu0.3 deb libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.2 deb -libkrb5support0 1.19.2-2ubuntu0.2 deb +libkrb5-3 1.19.2-2ubuntu0.3 deb +libkrb5support0 1.19.2-2ubuntu0.3 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.16+dfsg-0ubuntu0.22.04.2 deb -libldap-common 2.5.16+dfsg-0ubuntu0.22.04.2 deb +libldap-2.5-0 2.5.17+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb @@ -84,13 +84,13 @@ libnpth0 1.6-3build2 deb libnsl2 1.3.0-2build2 deb libonig5 6.9.7.1-2build1 deb libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.3 deb -libpam-modules-bin 1.4.0-11ubuntu2.3 deb -libpam-runtime 1.4.0-11ubuntu2.3 deb -libpam0g 1.4.0-11ubuntu2.3 deb +libpam-modules 1.4.0-11ubuntu2.4 deb +libpam-modules-bin 1.4.0-11ubuntu2.4 deb +libpam-runtime 1.4.0-11ubuntu2.4 deb +libpam0g 1.4.0-11ubuntu2.4 deb libpcre2-8-0 10.39-3ubuntu0.1 deb libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2 deb +libprocps8 2:3.3.17-6ubuntu2.1 deb libpsl5 0.21.0-1.2build2 deb libreadline8 8.1.2-1 deb librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb @@ -106,20 +106,20 @@ libsmartcols1 2.37.2-4ubuntu3 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.10 deb -libstdc++6 12.1.0-2ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.9 deb +libssl3 3.0.2-0ubuntu1.15 deb +libstdc++6 12.3.0-1ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.12 deb libtasn1-6 4.18.0-4build1 deb libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.9 deb +libudev1 249.11-0ubuntu3.12 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb locales 2.35-0ubuntu3.6 deb -login 1:4.8.1-2ubuntu2.1 deb +login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb mawk 1.3.4.20200120-3 deb @@ -129,16 +129,16 @@ ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb openssl 3.0.2-0ubuntu1.15 deb -passwd 1:4.8.1-2ubuntu2.1 deb -perl-base 5.34.0-3ubuntu1.2 deb +passwd 1:4.8.1-2ubuntu2.2 deb +perl-base 5.34.0-3ubuntu1.3 deb pinentry-curses 1.1.1-1build2 deb -procps 2:3.3.17-6ubuntu2 deb +procps 2:3.3.17-6ubuntu2.1 deb publicsuffix 20211207.1025-1 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.1 deb +tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb tzdata 2024a-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb usrmerge 25ubuntu2 deb From 4f6eaa7aee78e1a68b25c4ae89331025a27a9f9b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Apr 2024 23:38:43 +0000 Subject: [PATCH 07/72] Bot Updating Package Versions --- package_versions.txt | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index c6f76704..7a6ed230 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,16 +1,16 @@ NAME VERSION TYPE adduser 3.118ubuntu5 deb -apt 2.4.11 deb -apt-utils 2.4.11 deb +apt 2.4.12 deb +apt-utils 2.4.12 deb base-files 12ubuntu4.6 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1.1 deb bash 5.1.16 binary -bsdutils 1:2.37.2-4ubuntu3 deb +bsdutils 1:2.37.2-4ubuntu3.3 deb ca-certificates 20230311ubuntu0.22.04.1 deb -coreutils 8.32-4.1ubuntu1.1 deb +coreutils 8.32-4.1ubuntu1.2 deb cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.15 deb +curl 7.81.0-1ubuntu1.16 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -36,12 +36,12 @@ hostname 3.23ubuntu2 deb init-system-helpers 1.62 deb jq 1.6-2.1ubuntu3 deb libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.11 deb +libapt-pkg6.0 2.4.12 deb libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3 deb +libblkid1 2.37.2-4ubuntu3.3 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb @@ -51,7 +51,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 -libcurl4 7.81.0-1ubuntu1.15 deb +libcurl4 7.81.0-1ubuntu1.16 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.1 deb @@ -75,7 +75,7 @@ libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3 deb +libmount1 2.37.2-4ubuntu3.3 deb libncurses6 6.3-2ubuntu0.1 deb libncursesw6 6.3-2ubuntu0.1 deb libnettle8 3.7.3-1build2 deb @@ -102,7 +102,7 @@ libselinux1 3.3-1build2 deb libsemanage-common 3.3-1build2 deb libsemanage2 3.3-1build2 deb libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3 deb +libsmartcols1 2.37.2-4ubuntu3.3 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 @@ -115,7 +115,7 @@ libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb libudev1 249.11-0ubuntu3.12 deb libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3 deb +libuuid1 2.37.2-4ubuntu3.3 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb locales 2.35-0ubuntu3.6 deb @@ -123,7 +123,7 @@ login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3 deb +mount 2.37.2-4ubuntu3.3 deb ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb @@ -142,5 +142,5 @@ tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb tzdata 2024a-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3 deb +util-linux 2.37.2-4ubuntu3.3 deb zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From 8786100991b1d2bba54fae23a59b0eef62dde1ae Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Apr 2024 23:28:17 +0000 Subject: [PATCH 08/72] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 7a6ed230..cf120745 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-files 12ubuntu4.6 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1.1 deb bash 5.1.16 binary -bsdutils 1:2.37.2-4ubuntu3.3 deb +bsdutils 1:2.37.2-4ubuntu3.4 deb ca-certificates 20230311ubuntu0.22.04.1 deb coreutils 8.32-4.1ubuntu1.2 deb cron 3.0pl1-137ubuntu3 deb @@ -41,7 +41,7 @@ libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3.3 deb +libblkid1 2.37.2-4ubuntu3.4 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb @@ -59,7 +59,7 @@ libffi8 3.4.2-4 deb libgcc-s1 12.3.0-1ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.4 deb +libgnutls30 3.7.3-4ubuntu1.5 deb libgpg-error0 1.43-3 deb libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb libhogweed6 3.7.3-1build2 deb @@ -75,7 +75,7 @@ libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3.3 deb +libmount1 2.37.2-4ubuntu3.4 deb libncurses6 6.3-2ubuntu0.1 deb libncursesw6 6.3-2ubuntu0.1 deb libnettle8 3.7.3-1build2 deb @@ -102,7 +102,7 @@ libselinux1 3.3-1build2 deb libsemanage-common 3.3-1build2 deb libsemanage2 3.3-1build2 deb libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3.3 deb +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 @@ -115,7 +115,7 @@ libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb libudev1 249.11-0ubuntu3.12 deb libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3.3 deb +libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb locales 2.35-0ubuntu3.6 deb @@ -123,7 +123,7 @@ login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3.3 deb +mount 2.37.2-4ubuntu3.4 deb ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb @@ -142,5 +142,5 @@ tar 1.34+dfsg-1ubuntu0.1.22.04.2 deb tzdata 2024a-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3.3 deb +util-linux 2.37.2-4ubuntu3.4 deb zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From f4dd926eff2a9c442054a6368a88ecad64d9b84a Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 23 Apr 2024 23:26:53 +0000 Subject: [PATCH 09/72] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cf120745..c3da9d74 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,8 +45,8 @@ libblkid1 2.37.2-4ubuntu3.4 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.6 deb -libc6 2.35-0ubuntu3.6 deb +libc-bin 2.35-0ubuntu3.7 deb +libc6 2.35-0ubuntu3.7 deb 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 @@ -118,7 +118,7 @@ libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.6 deb +locales 2.35-0ubuntu3.7 deb login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb From 576a06552b7132dcfaa78d5b915b64537d332bf7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 30 Apr 2024 23:25:57 +0000 Subject: [PATCH 10/72] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cc6e107b..5961ee50 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -273,7 +273,7 @@ pipeline { # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github git clone --branch jammy --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} - docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true ghcr.io/linuxserver/jenkins-builder:latest + docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest echo "Starting Stage 1 - Jenkinsfile update" if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then mkdir -p ${TEMPDIR}/repo @@ -571,7 +571,7 @@ pipeline { sh '''#! /bin/bash set -e TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then + if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} else LOCAL_CONTAINER=${IMAGE}:${META_TAG} From 860abb494940ca9d3aed1fc84a283a759f392133 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 30 Apr 2024 23:30:30 +0000 Subject: [PATCH 11/72] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c3da9d74..544db4db 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -79,7 +79,7 @@ libmount1 2.37.2-4ubuntu3.4 deb libncurses6 6.3-2ubuntu0.1 deb libncursesw6 6.3-2ubuntu0.1 deb libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1ubuntu0.1 deb +libnghttp2-14 1.43.0-1ubuntu0.2 deb libnpth0 1.6-3build2 deb libnsl2 1.3.0-2build2 deb libonig5 6.9.7.1-2build1 deb From 3397401195e41cd725ac34cda148f876d191e9e1 Mon Sep 17 00:00:00 2001 From: Roxedus Date: Mon, 6 May 2024 20:33:19 +0200 Subject: [PATCH 12/72] Add Catatonit --- Dockerfile | 1 + Dockerfile.aarch64 | 1 + 2 files changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 0b2cb7c4..35ea2494 100644 --- a/Dockerfile +++ b/Dockerfile @@ -111,6 +111,7 @@ RUN \ locales && \ echo "**** install packages ****" && \ apt-get install -y \ + catatonit \ cron \ curl \ gnupg \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index bac994aa..2e9e3363 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -111,6 +111,7 @@ RUN \ locales && \ echo "**** install packages ****" && \ apt-get install -y \ + catatonit \ cron \ curl \ gnupg \ From 319ff4ca14e631b3a1ad80710d78ba546df07267 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 8 May 2024 18:53:59 +0000 Subject: [PATCH 13/72] Bot Updating Package Versions --- package_versions.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/package_versions.txt b/package_versions.txt index 544db4db..91a36aab 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -8,6 +8,7 @@ bash 5.1-6ubuntu1.1 deb bash 5.1.16 binary bsdutils 1:2.37.2-4ubuntu3.4 deb ca-certificates 20230311ubuntu0.22.04.1 deb +catatonit 0.1.7-1 deb coreutils 8.32-4.1ubuntu1.2 deb cron 3.0pl1-137ubuntu3 deb curl 7.81.0-1ubuntu1.16 deb From dbc1998ef20621f39b640c94fd3bf266201a3b74 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 12 May 2024 15:06:39 +0100 Subject: [PATCH 14/72] Remove armhf warning --- root/etc/s6-overlay/s6-rc.d/init-adduser/run | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/run b/root/etc/s6-overlay/s6-rc.d/init-adduser/run index 55aeebfa..a03a3e92 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-adduser/run +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/run @@ -27,20 +27,6 @@ User GID: $(id -g abc) ─────────────────────────────────────── " -if [[ "$(uname -m)" == "armv7l" ]] || [[ "$(uname -m)" == "armhf" ]]; then - echo ' -╔═════════════════════════════════════════════════════╗ -║ ║ -║ The 32-bit Arm version of this image will ║ -║ no longer be supported after 2023-07-01 ║ -║ ║ -║ See: https://linuxserver.io/armhf ║ -║ for more details ║ -║ ║ -╚═════════════════════════════════════════════════════╝ -' -fi - lsiown abc:abc /app lsiown abc:abc /config lsiown abc:abc /defaults From 39fcc1f50551a3f699bb76582e4f0e4fdc194595 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 14 May 2024 12:29:18 +0000 Subject: [PATCH 15/72] Bot Updating Package Versions --- package_versions.txt | 293 +++++++++++++++++++++---------------------- 1 file changed, 146 insertions(+), 147 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 91a36aab..168f37bf 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,147 +1,146 @@ -NAME VERSION TYPE -adduser 3.118ubuntu5 deb -apt 2.4.12 deb -apt-utils 2.4.12 deb -base-files 12ubuntu4.6 deb -base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1.1 deb -bash 5.1.16 binary -bsdutils 1:2.37.2-4ubuntu3.4 deb -ca-certificates 20230311ubuntu0.22.04.1 deb -catatonit 0.1.7-1 deb -coreutils 8.32-4.1ubuntu1.2 deb -cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.16 deb -dash 0.5.11+git20210903+057cd650a4ed-3build1 deb -debconf 1.5.79ubuntu1 deb -debianutils 5.5-1ubuntu2 deb -diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.1 deb -dpkg 1.21.1ubuntu2.3 deb -e2fsprogs 1.46.5-2ubuntu1.1 deb -findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.3.0-1ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.1 deb -gnupg-l10n 2.2.27-3ubuntu2.1 deb -gnupg-utils 2.2.27-3ubuntu2.1 deb -gpg 2.2.27-3ubuntu2.1 deb -gpg-agent 2.2.27-3ubuntu2.1 deb -gpg-wks-client 2.2.27-3ubuntu2.1 deb -gpg-wks-server 2.2.27-3ubuntu2.1 deb -gpgconf 2.2.27-3ubuntu2.1 deb -gpgsm 2.2.27-3ubuntu2.1 deb -gpgv 2.2.27-3ubuntu2.1 deb -grep 3.7-1build1 deb -gzip 1.10-4ubuntu4.1 deb -hostname 3.23ubuntu2 deb -init-system-helpers 1.62 deb -jq 1.6-2.1ubuntu3 deb -libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.12 deb -libassuan0 2.5.5-1build1 deb -libattr1 1:2.5.1-1build1 deb -libaudit-common 1:3.0.7-1build1 deb -libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3.4 deb -libbrotli1 1.0.9-2build6 deb -libbsd0 0.11.5-1 deb -libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.7 deb -libc6 2.35-0ubuntu3.7 deb -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 -libcurl4 7.81.0-1ubuntu1.16 deb -libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb -libdebconfclient0 0.261ubuntu1 deb -libext2fs2 1.46.5-2ubuntu1.1 deb -libffi8 3.4.2-4 deb -libgcc-s1 12.3.0-1ubuntu1~22.04 deb -libgcrypt20 1.9.4-3ubuntu3 deb -libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.5 deb -libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb -libhogweed6 3.7.3-1build2 deb -libidn2-0 2.3.2-2build1 deb -libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.3 deb -libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.3 deb -libkrb5support0 1.19.2-2ubuntu0.3 deb -libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.17+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb -liblz4-1 1.9.3-2build2 deb -liblzma5 5.2.5-2ubuntu1 deb -libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3.4 deb -libncurses6 6.3-2ubuntu0.1 deb -libncursesw6 6.3-2ubuntu0.1 deb -libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1ubuntu0.2 deb -libnpth0 1.6-3build2 deb -libnsl2 1.3.0-2build2 deb -libonig5 6.9.7.1-2build1 deb -libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.4 deb -libpam-modules-bin 1.4.0-11ubuntu2.4 deb -libpam-runtime 1.4.0-11ubuntu2.4 deb -libpam0g 1.4.0-11ubuntu2.4 deb -libpcre2-8-0 10.39-3ubuntu0.1 deb -libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2.1 deb -libpsl5 0.21.0-1.2build2 deb -libreadline8 8.1.2-1 deb -librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb -libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb -libseccomp2 2.5.3-2ubuntu2 deb -libselinux1 3.3-1build2 deb -libsemanage-common 3.3-1build2 deb -libsemanage2 3.3-1build2 deb -libsepol2 3.3-1build1 deb -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 -libstdc++6 12.3.0-1ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.12 deb -libtasn1-6 4.18.0-4build1 deb -libtinfo6 6.3-2ubuntu0.1 deb -libtirpc-common 1.3.2-2ubuntu0.1 deb -libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.12 deb -libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3.4 deb -libxxhash0 0.8.1-1 deb -libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.7 deb -login 1:4.8.1-2ubuntu2.2 deb -logsave 1.46.5-2ubuntu1.1 deb -lsb-base 11.1.0ubuntu4 deb -mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3.4 deb -ncurses-base 6.3-2ubuntu0.1 deb -ncurses-bin 6.3-2ubuntu0.1 deb -netcat 1.218-4ubuntu1 deb -netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.15 deb -passwd 1:4.8.1-2ubuntu2.2 deb -perl-base 5.34.0-3ubuntu1.3 deb -pinentry-curses 1.1.1-1build2 deb -procps 2:3.3.17-6ubuntu2.1 deb -publicsuffix 20211207.1025-1 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 -ubuntu-keyring 2021.03.26 deb -usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3.4 deb -zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb +NAME VERSION TYPE +adduser 3.118ubuntu5 deb +apt 2.4.12 deb +apt-utils 2.4.12 deb +base-files 12ubuntu4.6 deb +base-passwd 3.5.52build1 deb +bash 5.1-6ubuntu1.1 deb +bsdutils 1:2.37.2-4ubuntu3.4 deb +ca-certificates 20230311ubuntu0.22.04.1 deb +catatonit 0.1.7-1 deb +coreutils 8.32-4.1ubuntu1.2 deb +cron 3.0pl1-137ubuntu3 deb +curl 7.81.0-1ubuntu1.16 deb +dash 0.5.11+git20210903+057cd650a4ed-3build1 deb +debconf 1.5.79ubuntu1 deb +debianutils 5.5-1ubuntu2 deb +diffutils 1:3.8-0ubuntu2 deb +dirmngr 2.2.27-3ubuntu2.1 deb +dpkg 1.21.1ubuntu2.3 deb +e2fsprogs 1.46.5-2ubuntu1.1 deb +findutils 4.8.0-1ubuntu3 deb +gcc-12-base 12.3.0-1ubuntu1~22.04 deb +gnupg 2.2.27-3ubuntu2.1 deb +gnupg-l10n 2.2.27-3ubuntu2.1 deb +gnupg-utils 2.2.27-3ubuntu2.1 deb +gpg 2.2.27-3ubuntu2.1 deb +gpg-agent 2.2.27-3ubuntu2.1 deb +gpg-wks-client 2.2.27-3ubuntu2.1 deb +gpg-wks-server 2.2.27-3ubuntu2.1 deb +gpgconf 2.2.27-3ubuntu2.1 deb +gpgsm 2.2.27-3ubuntu2.1 deb +gpgv 2.2.27-3ubuntu2.1 deb +grep 3.7-1build1 deb +gzip 1.10-4ubuntu4.1 deb +hostname 3.23ubuntu2 deb +init-system-helpers 1.62 deb +jq 1.6-2.1ubuntu3 deb +libacl1 2.3.1-1 deb +libapt-pkg6.0 2.4.12 deb +libassuan0 2.5.5-1build1 deb +libattr1 1:2.5.1-1build1 deb +libaudit-common 1:3.0.7-1build1 deb +libaudit1 1:3.0.7-1build1 deb +libblkid1 2.37.2-4ubuntu3.4 deb +libbrotli1 1.0.9-2build6 deb +libbsd0 0.11.5-1 deb +libbz2-1.0 1.0.8-5build1 deb +libc-bin 2.35-0ubuntu3.7 deb +libc6 2.35-0ubuntu3.7 deb +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 +libcurl4 7.81.0-1ubuntu1.16 deb +libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb +libdebconfclient0 0.261ubuntu1 deb +libext2fs2 1.46.5-2ubuntu1.1 deb +libffi8 3.4.2-4 deb +libgcc-s1 12.3.0-1ubuntu1~22.04 deb +libgcrypt20 1.9.4-3ubuntu3 deb +libgmp10 2:6.2.1+dfsg-3ubuntu1 deb +libgnutls30 3.7.3-4ubuntu1.5 deb +libgpg-error0 1.43-3 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb +libhogweed6 3.7.3-1build2 deb +libidn2-0 2.3.2-2build1 deb +libjq1 1.6-2.1ubuntu3 deb +libk5crypto3 1.19.2-2ubuntu0.3 deb +libkeyutils1 1.6.1-2ubuntu3 deb +libkrb5-3 1.19.2-2ubuntu0.3 deb +libkrb5support0 1.19.2-2ubuntu0.3 deb +libksba8 1.6.0-2ubuntu0.2 deb +libldap-2.5-0 2.5.17+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb +liblz4-1 1.9.3-2build2 deb +liblzma5 5.2.5-2ubuntu1 deb +libmd0 1.0.4-1build1 deb +libmount1 2.37.2-4ubuntu3.4 deb +libncurses6 6.3-2ubuntu0.1 deb +libncursesw6 6.3-2ubuntu0.1 deb +libnettle8 3.7.3-1build2 deb +libnghttp2-14 1.43.0-1ubuntu0.2 deb +libnpth0 1.6-3build2 deb +libnsl2 1.3.0-2build2 deb +libonig5 6.9.7.1-2build1 deb +libp11-kit0 0.24.0-6build1 deb +libpam-modules 1.4.0-11ubuntu2.4 deb +libpam-modules-bin 1.4.0-11ubuntu2.4 deb +libpam-runtime 1.4.0-11ubuntu2.4 deb +libpam0g 1.4.0-11ubuntu2.4 deb +libpcre2-8-0 10.39-3ubuntu0.1 deb +libpcre3 2:8.39-13ubuntu0.22.04.1 deb +libprocps8 2:3.3.17-6ubuntu2.1 deb +libpsl5 0.21.0-1.2build2 deb +libreadline8 8.1.2-1 deb +librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb +libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb +libseccomp2 2.5.3-2ubuntu2 deb +libselinux1 3.3-1build2 deb +libsemanage-common 3.3-1build2 deb +libsemanage2 3.3-1build2 deb +libsepol2 3.3-1build1 deb +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 +libstdc++6 12.3.0-1ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.12 deb +libtasn1-6 4.18.0-4build1 deb +libtinfo6 6.3-2ubuntu0.1 deb +libtirpc-common 1.3.2-2ubuntu0.1 deb +libtirpc3 1.3.2-2ubuntu0.1 deb +libudev1 249.11-0ubuntu3.12 deb +libunistring2 1.0-1 deb +libuuid1 2.37.2-4ubuntu3.4 deb +libxxhash0 0.8.1-1 deb +libzstd1 1.4.8+dfsg-3build1 deb +locales 2.35-0ubuntu3.7 deb +login 1:4.8.1-2ubuntu2.2 deb +logsave 1.46.5-2ubuntu1.1 deb +lsb-base 11.1.0ubuntu4 deb +mawk 1.3.4.20200120-3 deb +mount 2.37.2-4ubuntu3.4 deb +ncurses-base 6.3-2ubuntu0.1 deb +ncurses-bin 6.3-2ubuntu0.1 deb +netcat 1.218-4ubuntu1 deb +netcat-openbsd 1.218-4ubuntu1 deb +openssl 3.0.2-0ubuntu1.15 deb +passwd 1:4.8.1-2ubuntu2.2 deb +perl-base 5.34.0-3ubuntu1.3 deb +pinentry-curses 1.1.1-1build2 deb +procps 2:3.3.17-6ubuntu2.1 deb +publicsuffix 20211207.1025-1 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 +ubuntu-keyring 2021.03.26 deb +usrmerge 25ubuntu2 deb +util-linux 2.37.2-4ubuntu3.4 deb +zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From 894092aaefd8ed70fc655cc03ac3bcf64ebc06d6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 21 May 2024 23:27:09 +0000 Subject: [PATCH 16/72] Bot Updating Templated Files --- Jenkinsfile | 41 +++++++++++------------------------------ 1 file changed, 11 insertions(+), 30 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 5961ee50..9a0ce1a6 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -293,7 +293,7 @@ pipeline { echo "Jenkinsfile is up to date." fi echo "Starting Stage 2 - Delete old templates" - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml Dockerfile.armhf" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -488,6 +488,7 @@ pipeline { --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -518,6 +519,7 @@ pipeline { --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." } } @@ -545,6 +547,7 @@ pipeline { --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ + --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" retry(5) { @@ -668,7 +671,7 @@ pipeline { --shm-size=1gb \ -v /var/run/docker.sock:/var/run/docker.sock \ -e IMAGE=\"${IMAGE}\" \ - -e DELAY_START=\"${CI_DELAY}\" \ + -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \ -e TAGS=\"${CI_TAGS}\" \ -e META_TAG=\"${META_TAG}\" \ -e PORT=\"${CI_PORT}\" \ @@ -776,35 +779,13 @@ pipeline { docker push ${MANIFESTIMAGE}:amd64-${SEMVER} docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi - docker manifest push --purge ${MANIFESTIMAGE}:jammy || : - docker manifest create ${MANIFESTIMAGE}:jammy ${MANIFESTIMAGE}:amd64-jammy ${MANIFESTIMAGE}:arm64v8-jammy - docker manifest annotate ${MANIFESTIMAGE}:jammy ${MANIFESTIMAGE}:arm64v8-jammy --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8 - docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} || : - docker manifest create ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - docker manifest annotate ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} --os linux --arch arm64 --variant v8 - if [ -n "${SEMVER}" ]; then - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} || : - docker manifest create ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - docker manifest annotate ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} --os linux --arch arm64 --variant v8 - fi - token=$(curl -sX GET "https://ghcr.io/token?scope=repository%3Alinuxserver%2F${CONTAINER_NAME}%3Apull" | jq -r '.token') - digest=$(curl -s \ - --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \ - --header "Authorization: Bearer ${token}" \ - "https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-jammy") - if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-jammy || : - docker manifest create ${MANIFESTIMAGE}:arm32v7-jammy ${MANIFESTIMAGE}:amd64-jammy - docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-jammy - fi - docker manifest push --purge ${MANIFESTIMAGE}:jammy - docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} - docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} + done + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + docker buildx imagetools create -t ${MANIFESTIMAGE}:jammy ${MANIFESTIMAGE}:amd64-jammy ${MANIFESTIMAGE}:arm64v8-jammy + docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then - docker manifest push --purge ${MANIFESTIMAGE}:${SEMVER} + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} fi done ''' From 0387117443af497f95b9207a4e210bd83dc3dc4c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Jun 2024 23:30:40 +0000 Subject: [PATCH 17/72] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 168f37bf..f0214b3e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,8 +45,8 @@ libblkid1 2.37.2-4ubuntu3.4 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.7 deb -libc6 2.35-0ubuntu3.7 deb +libc-bin 2.35-0ubuntu3.8 deb +libc6 2.35-0ubuntu3.8 deb 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 @@ -118,7 +118,7 @@ libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.7 deb +locales 2.35-0ubuntu3.8 deb login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.1 deb lsb-base 11.1.0ubuntu4 deb From 2162be9ed91edeeefc9b8bde30db77d21b04742b Mon Sep 17 00:00:00 2001 From: thespad Date: Mon, 10 Jun 2024 15:54:43 +0100 Subject: [PATCH 18/72] Copy lsiown from repo --- Dockerfile | 2 ++ Dockerfile.aarch64 | 2 ++ jenkins-vars.yml | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 35ea2494..f761a5be 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,11 +49,13 @@ ARG BUILD_DATE ARG VERSION ARG MODS_VERSION="v3" ARG PKG_INST_VERSION="v1" +ARG LSIOWN_VERSION="v1" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" # set environment variables ARG DEBIAN_FRONTEND="noninteractive" diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 2e9e3363..dda53286 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -49,11 +49,13 @@ ARG BUILD_DATE ARG VERSION ARG MODS_VERSION="v3" ARG PKG_INST_VERSION="v1" +ARG LSIOWN_VERSION="v1" LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" LABEL maintainer="TheLamer" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" +ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" # set environment variables ARG DEBIAN_FRONTEND="noninteractive" diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 85d46168..b6b62ae6 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -21,6 +21,6 @@ repo_vars: - CI_PORT='80' - CI_SSL='true' - CI_DELAY='30' - - CI_DOCKERENV='TZ=US/Pacific|LSIO_FIRST_PARTY=true' - - CI_AUTH='user:password' + - CI_DOCKERENV='LSIO_FIRST_PARTY=true' + - CI_AUTH='' - CI_WEBPATH='' From 3cb89a7ddb4130c95b24a76bc72f22b2687561e1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Wed, 12 Jun 2024 15:51:05 +0000 Subject: [PATCH 19/72] Bot Updating Templated Files --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9a0ce1a6..8bc801ce 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -31,8 +31,8 @@ pipeline { CI_PORT='80' CI_SSL='true' CI_DELAY='30' - CI_DOCKERENV='TZ=US/Pacific|LSIO_FIRST_PARTY=true' - CI_AUTH='user:password' + CI_DOCKERENV='LSIO_FIRST_PARTY=true' + CI_AUTH='' CI_WEBPATH='' } stages { From 8bc271783b29d5141913e214caa2340ebdf00c97 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 2 Jul 2024 23:29:17 +0000 Subject: [PATCH 20/72] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f0214b3e..b3304a3b 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,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 @@ -128,7 +128,7 @@ ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 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 From 3b654ea2fd487b0883acee153b05b35e0fba587e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 9 Jul 2024 23:30:42 +0000 Subject: [PATCH 21/72] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index b3304a3b..70d0bd6e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -139,7 +139,7 @@ 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 usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3.4 deb From ba50c7c68a565926bff31a06d2d97bb0ae8fe916 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Jul 2024 23:30:25 +0000 Subject: [PATCH 22/72] Bot Updating Templated Files --- Jenkinsfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 8bc801ce..dee287cc 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -243,7 +243,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 && \ @@ -350,7 +350,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 @@ -664,7 +664,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 \ @@ -755,7 +755,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 From b46fae470ed8aad6d4bde6b1603e41198c39e97f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Jul 2024 23:31:43 +0000 Subject: [PATCH 23/72] Bot Updating Templated Files --- .github/workflows/permissions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/permissions.yml b/.github/workflows/permissions.yml index 1447bc55..02e1bdb9 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 From 6ffc718eb24bcde64d948a179367c3a6f972538e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 16 Jul 2024 23:35:17 +0000 Subject: [PATCH 24/72] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 70d0bd6e..a51085c4 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -70,8 +70,8 @@ libkeyutils1 1.6.1-2ubuntu3 deb libkrb5-3 1.19.2-2ubuntu0.3 deb libkrb5support0 1.19.2-2ubuntu0.3 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.17+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.17+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.18+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb From 2ae996f1b0f6e56a6493bdaf271eb9b7dfbfde43 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 30 Jul 2024 23:25:17 +0000 Subject: [PATCH 25/72] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a51085c4..91bba013 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -70,8 +70,8 @@ libkeyutils1 1.6.1-2ubuntu3 deb libkrb5-3 1.19.2-2ubuntu0.3 deb libkrb5support0 1.19.2-2ubuntu0.3 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.18+dfsg-0ubuntu0.22.04.1 deb +libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.2 deb +libldap-common 2.5.18+dfsg-0ubuntu0.22.04.2 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb From 566530ed1259a3d53a5466fb5fa6e34540efb946 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 6 Aug 2024 23:30:43 +0000 Subject: [PATCH 26/72] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 91bba013..13aa40ae 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates 20230311ubuntu0.22.04.1 deb catatonit 0.1.7-1 deb coreutils 8.32-4.1ubuntu1.2 deb cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.16 deb +curl 7.81.0-1ubuntu1.17 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -51,7 +51,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 -libcurl4 7.81.0-1ubuntu1.16 deb +libcurl4 7.81.0-1ubuntu1.17 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.1 deb @@ -106,7 +106,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.16 deb +libssl3 3.0.2-0ubuntu1.17 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.12 deb libtasn1-6 4.18.0-4build1 deb @@ -128,7 +128,7 @@ ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.16 deb +openssl 3.0.2-0ubuntu1.17 deb passwd 1:4.8.1-2ubuntu2.2 deb perl-base 5.34.0-3ubuntu1.3 deb pinentry-curses 1.1.1-1build2 deb From 58acae7fbc9457fe4ed73b566c40435319c45125 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 13 Aug 2024 23:29:23 +0000 Subject: [PATCH 27/72] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 13aa40ae..a37e8c58 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -61,14 +61,14 @@ libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.5 deb libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.3 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.4 deb libhogweed6 3.7.3-1build2 deb libidn2-0 2.3.2-2build1 deb libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.3 deb +libk5crypto3 1.19.2-2ubuntu0.4 deb libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.3 deb -libkrb5support0 1.19.2-2ubuntu0.3 deb +libkrb5-3 1.19.2-2ubuntu0.4 deb +libkrb5support0 1.19.2-2ubuntu0.4 deb libksba8 1.6.0-2ubuntu0.2 deb libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.2 deb libldap-common 2.5.18+dfsg-0ubuntu0.22.04.2 deb From c189495ebdc62a4b0c19bfa061c61fb3691741c7 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Aug 2024 23:29:13 +0000 Subject: [PATCH 28/72] Bot Updating Templated Files --- Jenkinsfile | 58 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dee287cc..d547f828 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -17,6 +17,8 @@ pipeline { GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') GITLAB_NAMESPACE=credentials('gitlab-namespace-id') DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') + QUAYIO_API_TOKEN=credentials('quayio-repo-api-token') + GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f') BUILD_VERSION_ARG = 'OS' LS_USER = 'linuxserver' LS_REPO = 'docker-baseimage-ubuntu' @@ -36,9 +38,23 @@ pipeline { CI_WEBPATH='' } stages { + stage("Set git config"){ + steps{ + sh '''#!/bin/bash + cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign + chmod 600 /config/.ssh/id_sign + ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub + echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits" + git config --global gpg.format ssh + git config --global user.signingkey /config/.ssh/id_sign + git config --global commit.gpgsign true + ''' + } + } // Setup all the basic environment variables needed for the build stage("Set ENV Variables base"){ steps{ + echo "Running on node: ${NODE_NAME}" sh '''#! /bin/bash containers=$(docker ps -aq) if [[ -n "${containers}" ]]; then @@ -440,10 +456,10 @@ pipeline { } } /* ####################### - GitLab Mirroring + GitLab Mirroring and Quay.io Repo Visibility ####################### */ - // Ping into Gitlab to mirror this repo and have a registry endpoint - stage("GitLab Mirror"){ + // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public + stage("GitLab Mirror and Quay.io Visibility"){ when { environment name: 'EXIT_STATUS', value: '' } @@ -459,6 +475,8 @@ pipeline { "visibility":"public"}' ''' sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \ -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" ''' + sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \ + -d '{"visibility":"public"}' ||: ''' } } /* ############### @@ -550,7 +568,7 @@ pipeline { --provenance=false --sbom=false \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry(5) { + retry_backoff(5,5) { sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" } sh '''#! /bin/bash @@ -706,7 +724,7 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - retry(5) { + retry_backoff(5,5) { sh '''#! /bin/bash set -e echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin @@ -724,7 +742,7 @@ pipeline { docker push ${PUSHIMAGE}:${META_TAG} docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} if [ -n "${SEMVER}" ]; then - docker push ${PUSHIMAGE}:${SEMVER} + docker push ${PUSHIMAGE}:${SEMVER} fi done ''' @@ -747,7 +765,7 @@ pipeline { passwordVariable: 'QUAYPASS' ] ]) { - retry(5) { + retry_backoff(5,5) { sh '''#! /bin/bash set -e echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin @@ -810,7 +828,7 @@ pipeline { "object": "'${COMMIT_SHA}'",\ "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to jammy",\ "type": "commit",\ - "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' + "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json @@ -942,6 +960,13 @@ EOF ###################### */ post { always { + sh '''#!/bin/bash + rm -rf /config/.ssh/id_sign + rm -rf /config/.ssh/id_sign.pub + git config --global --unset gpg.format + git config --global --unset user.signingkey + git config --global --unset commit.gpgsign + ''' script{ if (env.EXIT_STATUS == "ABORTED"){ sh 'echo "build aborted"' @@ -971,3 +996,20 @@ EOF } } } + +def retry_backoff(int max_attempts, int power_base, Closure c) { + int n = 0 + while (n < max_attempts) { + try { + c() + return + } catch (err) { + if ((n + 1) >= max_attempts) { + throw err + } + sleep(power_base ** n) + n++ + } + } + return +} From a7dd06ca43346624045b7fa36cc4c5f0e71d8e30 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 20 Aug 2024 23:31:28 +0000 Subject: [PATCH 29/72] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 3 ++- .../workflows/external_trigger_scheduler.yml | 24 +++++++++---------- .github/workflows/package_trigger.yml | 22 ++++++++--------- .../workflows/package_trigger_scheduler.yml | 18 +++++++------- 4 files changed, 34 insertions(+), 33 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 95633ffe..c1fd1e4d 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -12,6 +12,7 @@ jobs: - name: External Trigger if: github.ref == 'refs/heads/jammy' run: | - echo "**** No external release, exiting ****" + printf "# External trigger for docker-baseimage-ubuntu\n\n" >> $GITHUB_STEP_SUMMARY + echo "Type is \`os\`" >> $GITHUB_STEP_SUMMARY echo "No external release, exiting" >> $GITHUB_STEP_SUMMARY exit 0 diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index 4be5ee62..d550b4e5 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -15,31 +15,31 @@ jobs: - name: External Trigger Scheduler run: | - echo "**** Branches found: ****" - git for-each-ref --format='%(refname:short)' refs/remotes - for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + printf "# External trigger scheduler for docker-baseimage-ubuntu\n\n" >> $GITHUB_STEP_SUMMARY + printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY + for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes) do - br=$(echo "$br" | sed 's|origin/||g') - echo "**** Evaluating branch ${br} ****" + if [[ "${br}" == "HEAD" ]]; then + printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY + continue + fi + printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY ls_jenkins_vars=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/jenkins-vars.yml) ls_branch=$(echo "${ls_jenkins_vars}" | yq -r '.ls_branch') ls_trigger=$(echo "${ls_jenkins_vars}" | yq -r '.external_type') if [[ "${br}" == "${ls_branch}" ]] && [[ "${ls_trigger}" != "os" ]]; then - echo "**** Branch ${br} appears to be live and trigger is not os; checking workflow. ****" + echo "Branch appears to be live and trigger is not os; checking workflow." >> $GITHUB_STEP_SUMMARY if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then - echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****." - echo "Triggering external trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY + echo "Triggering external trigger workflow for branch." >> $GITHUB_STEP_SUMMARY curl -iX POST \ -H "Authorization: token ${{ secrets.CR_PAT }}" \ -H "Accept: application/vnd.github.v3+json" \ -d "{\"ref\":\"refs/heads/${br}\"}" \ https://api.github.com/repos/linuxserver/docker-baseimage-ubuntu/actions/workflows/external_trigger.yml/dispatches else - echo "**** Workflow doesn't exist; skipping trigger. ****" - echo "Skipping branch ${br} due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY + echo "Skipping branch due to no external trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} is either a dev branch, or has no external version; skipping trigger. ****" - echo "Skipping branch ${br} due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY + echo "Skipping branch due to being detected as dev branch or having no external version." >> $GITHUB_STEP_SUMMARY fi done diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml index fa01776a..5232a62c 100644 --- a/.github/workflows/package_trigger.yml +++ b/.github/workflows/package_trigger.yml @@ -12,29 +12,29 @@ jobs: - name: Package Trigger if: github.ref == 'refs/heads/jammy' run: | + printf "# Package trigger for docker-baseimage-ubuntu\n\n" >> $GITHUB_STEP_SUMMARY if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY }}" ]; then - echo "**** Github secret PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY is set; skipping trigger. ****" - echo "Github secret \`PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY exit 0 fi if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/jammy/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****" - echo "There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY exit 0 fi - echo "**** Package trigger running off of jammy branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY\". ****" - echo "Package trigger running off of jammy branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY\`" >> $GITHUB_STEP_SUMMARY + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Package trigger running off of jammy branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY\`" >> $GITHUB_STEP_SUMMARY response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/jammy/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "**** Jenkins job queue url: ${response%$'\r'} ****" - echo "**** Sleeping 10 seconds until job starts ****" + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') buildurl="${buildurl%$'\r'}" - echo "**** Jenkins job build url: ${buildurl} ****" - echo "Jenkins job build url: ${buildurl}" >> $GITHUB_STEP_SUMMARY - echo "**** Attempting to change the Jenkins job description ****" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY curl -iX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 056097c5..fbc3024e 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -15,17 +15,19 @@ jobs: - name: Package Trigger Scheduler run: | - echo "**** Branches found: ****" - git for-each-ref --format='%(refname:short)' refs/remotes - for br in $(git for-each-ref --format='%(refname:short)' refs/remotes) + printf "# Package trigger scheduler for docker-baseimage-ubuntu\n\n" >> $GITHUB_STEP_SUMMARY + printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY + for br in $(git for-each-ref --format='%(refname:lstrip=3)' refs/remotes) do - br=$(echo "$br" | sed 's|origin/||g') - echo "**** Evaluating branch ${br} ****" + if [[ "${br}" == "HEAD" ]]; then + printf "\nSkipping %s.\n" ${br} >> $GITHUB_STEP_SUMMARY + continue + fi + printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/jenkins-vars.yml | yq -r '.ls_branch') if [ "${br}" == "${ls_branch}" ]; then - echo "**** Branch ${br} appears to be live; checking workflow. ****" + echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then - echo "**** Workflow exists. Triggering package trigger workflow for branch ${br}. ****" echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY triggered_branches="${triggered_branches}${br} " curl -iX POST \ @@ -35,11 +37,9 @@ jobs: https://api.github.com/repos/linuxserver/docker-baseimage-ubuntu/actions/workflows/package_trigger.yml/dispatches sleep 30 else - echo "**** Workflow doesn't exist; skipping trigger. ****" echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY fi else - echo "**** ${br} appears to be a dev branch; skipping trigger. ****" echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done From ac30f0613fa035e12a6de5ce78d17d873586c83d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 27 Aug 2024 23:29:48 +0000 Subject: [PATCH 30/72] Bot Updating Package Versions --- package_versions.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a37e8c58..6504b546 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -17,7 +17,7 @@ debianutils 5.5-1ubuntu2 deb diffutils 1:3.8-0ubuntu2 deb dirmngr 2.2.27-3ubuntu2.1 deb dpkg 1.21.1ubuntu2.3 deb -e2fsprogs 1.46.5-2ubuntu1.1 deb +e2fsprogs 1.46.5-2ubuntu1.2 deb findutils 4.8.0-1ubuntu3 deb gcc-12-base 12.3.0-1ubuntu1~22.04 deb gnupg 2.2.27-3ubuntu2.1 deb @@ -49,12 +49,12 @@ libc-bin 2.35-0ubuntu3.8 deb libc6 2.35-0ubuntu3.8 deb 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 +libcom-err2 1.46.5-2ubuntu1.2 deb libcrypt1 1:4.4.27-1 deb libcurl4 7.81.0-1ubuntu1.17 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb -libext2fs2 1.46.5-2ubuntu1.1 deb +libext2fs2 1.46.5-2ubuntu1.2 deb libffi8 3.4.2-4 deb libgcc-s1 12.3.0-1ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb @@ -104,7 +104,7 @@ libsemanage2 3.3-1build2 deb libsepol2 3.3-1build1 deb libsmartcols1 2.37.2-4ubuntu3.4 deb libsqlite3-0 3.37.2-2ubuntu0.3 deb -libss2 1.46.5-2ubuntu1.1 deb +libss2 1.46.5-2ubuntu1.2 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb libssl3 3.0.2-0ubuntu1.17 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb @@ -120,7 +120,7 @@ libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb locales 2.35-0ubuntu3.8 deb login 1:4.8.1-2ubuntu2.2 deb -logsave 1.46.5-2ubuntu1.1 deb +logsave 1.46.5-2ubuntu1.2 deb lsb-base 11.1.0ubuntu4 deb mawk 1.3.4.20200120-3 deb mount 2.37.2-4ubuntu3.4 deb From 2a9a7f470c89faa507896d81e98db961d0567486 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 3 Sep 2024 23:30:36 +0000 Subject: [PATCH 31/72] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 6504b546..183eb649 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -106,7 +106,7 @@ libsmartcols1 2.37.2-4ubuntu3.4 deb libsqlite3-0 3.37.2-2ubuntu0.3 deb libss2 1.46.5-2ubuntu1.2 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb -libssl3 3.0.2-0ubuntu1.17 deb +libssl3 3.0.2-0ubuntu1.18 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.12 deb libtasn1-6 4.18.0-4build1 deb @@ -128,7 +128,7 @@ ncurses-base 6.3-2ubuntu0.1 deb ncurses-bin 6.3-2ubuntu0.1 deb netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.17 deb +openssl 3.0.2-0ubuntu1.18 deb passwd 1:4.8.1-2ubuntu2.2 deb perl-base 5.34.0-3ubuntu1.3 deb pinentry-curses 1.1.1-1build2 deb From 95abaffe3a18151a2ac53c7ae4c8d285075cc836 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 10 Sep 2024 23:30:34 +0000 Subject: [PATCH 32/72] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 183eb649..564fef8e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,8 +1,8 @@ NAME VERSION TYPE adduser 3.118ubuntu5 deb -apt 2.4.12 deb -apt-utils 2.4.12 deb -base-files 12ubuntu4.6 deb +apt 2.4.13 deb +apt-utils 2.4.13 deb +base-files 12ubuntu4.7 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1.1 deb bsdutils 1:2.37.2-4ubuntu3.4 deb @@ -36,7 +36,7 @@ hostname 3.23ubuntu2 deb init-system-helpers 1.62 deb jq 1.6-2.1ubuntu3 deb libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.12 deb +libapt-pkg6.0 2.4.13 deb libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb From ae99560c3686a85f2b464e724bb37d098af6fb36 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 Sep 2024 23:32:56 +0000 Subject: [PATCH 33/72] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 564fef8e..2506e184 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates 20230311ubuntu0.22.04.1 deb catatonit 0.1.7-1 deb coreutils 8.32-4.1ubuntu1.2 deb cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.17 deb +curl 7.81.0-1ubuntu1.18 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -51,7 +51,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.2 deb libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.17 deb +libcurl4 7.81.0-1ubuntu1.18 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.2 deb From af73702356a414adcce4b80dc903593586906b9d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Oct 2024 23:29:08 +0000 Subject: [PATCH 34/72] Bot Updating Templated Files --- Jenkinsfile | 62 ++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 50 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d547f828..343eacf8 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -81,7 +81,7 @@ pipeline { env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml ./.github/workflows/package_trigger.yml' + env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml' } sh '''#! /bin/bash echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' @@ -309,7 +309,7 @@ pipeline { echo "Jenkinsfile is up to date." fi echo "Starting Stage 2 - Delete old templates" - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml" + OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml .github/workflows/package_trigger.yml" for i in ${OLD_TEMPLATES}; do if [[ -f "${i}" ]]; then TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" @@ -680,6 +680,14 @@ pipeline { } sh '''#! /bin/bash set -e + if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then + echo "Detected baseimage, setting LSIO_FIRST_PARTY=true" + if [ -n "${CI_DOCKERENV}" ]; then + CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}" + else + CI_DOCKERENV="LSIO_FIRST_PARTY=true" + fi + fi docker pull ghcr.io/linuxserver/ci:latest if [ "${MULTIARCH}" == "true" ]; then docker pull ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} --platform=arm64 @@ -692,15 +700,17 @@ pipeline { -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \ -e TAGS=\"${CI_TAGS}\" \ -e META_TAG=\"${META_TAG}\" \ + -e RELEASE_TAG=\"jammy\" \ -e PORT=\"${CI_PORT}\" \ -e SSL=\"${CI_SSL}\" \ -e BASE=\"${DIST_IMAGE}\" \ -e SECRET_KEY=\"${S3_SECRET}\" \ -e ACCESS_KEY=\"${S3_KEY}\" \ - -e DOCKER_ENV=\"LSIO_FIRST_PARTY=true|${CI_DOCKERENV}\" \ + -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ -e WEB_SCREENSHOT=\"${CI_WEB}\" \ -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ + -e NODE_NAME=\"${NODE_NAME}\" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } @@ -968,17 +978,45 @@ EOF git config --global --unset commit.gpgsign ''' script{ + env.JOB_DATE = sh( + script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', + returnStdout: true).trim() if (env.EXIT_STATUS == "ABORTED"){ sh 'echo "build aborted"' - } - else if (currentBuild.currentResult == "SUCCESS"){ - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 1681177,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** Success\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ - "username": "Jenkins"}' ${BUILDS_DISCORD} ''' - } - else { - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"color": 16711680,\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** failure\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ + }else{ + if (currentBuild.currentResult == "SUCCESS"){ + if (env.GITHUBIMAGE =~ /lspipepr/){ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=3957028 + env.JOB_WEBHOOK_FOOTER='PR Build' + }else if (env.GITHUBIMAGE =~ /lsiodev/){ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=3957028 + env.JOB_WEBHOOK_FOOTER='Dev Build' + }else{ + env.JOB_WEBHOOK_STATUS='Success' + env.JOB_WEBHOOK_COLOUR=1681177 + env.JOB_WEBHOOK_FOOTER='Live Build' + } + }else{ + if (env.GITHUBIMAGE =~ /lspipepr/){ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=12669523 + env.JOB_WEBHOOK_FOOTER='PR Build' + }else if (env.GITHUBIMAGE =~ /lsiodev/){ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=12669523 + env.JOB_WEBHOOK_FOOTER='Dev Build' + }else{ + env.JOB_WEBHOOK_STATUS='Failure' + env.JOB_WEBHOOK_COLOUR=16711680 + env.JOB_WEBHOOK_FOOTER='Live Build' + } + } + sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\ + "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\ + "timestamp": "'${JOB_DATE}'",\ + "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } } From be2573743c4c030ef323297a1c3d5a8b3b62da3c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Oct 2024 23:31:07 +0000 Subject: [PATCH 35/72] Bot Updating Templated Files --- .github/workflows/package_trigger.yml | 42 --------------------------- 1 file changed, 42 deletions(-) delete mode 100644 .github/workflows/package_trigger.yml diff --git a/.github/workflows/package_trigger.yml b/.github/workflows/package_trigger.yml deleted file mode 100644 index 5232a62c..00000000 --- a/.github/workflows/package_trigger.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Package Trigger Main - -on: - workflow_dispatch: - -jobs: - package-trigger-jammy: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.1 - - - name: Package Trigger - if: github.ref == 'refs/heads/jammy' - run: | - printf "# Package trigger for docker-baseimage-ubuntu\n\n" >> $GITHUB_STEP_SUMMARY - if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY }}" ]; then - echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> Github secret \`PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY\` is set; skipping trigger." >> $GITHUB_STEP_SUMMARY - exit 0 - fi - if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/jammy/lastBuild/api/json | jq -r '.building') == "true" ]; then - echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY - echo "> There already seems to be an active build on Jenkins; skipping package trigger" >> $GITHUB_STEP_SUMMARY - exit 0 - fi - echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY - echo "> Package trigger running off of jammy branch. To disable, set a Github secret named \`PAUSE_PACKAGE_TRIGGER_BASEIMAGE_UBUNTU_JAMMY\`" >> $GITHUB_STEP_SUMMARY - response=$(curl -iX POST \ - https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/jammy/buildWithParameters?PACKAGE_CHECK=true \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") - echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY - echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY - sleep 10 - buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') - buildurl="${buildurl%$'\r'}" - echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY - echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ - "${buildurl}submitDescription" \ - --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ - --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" From 2d77de1e413b7b73b09c734a06010336d85cc92f Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Oct 2024 23:33:05 +0000 Subject: [PATCH 36/72] Bot Updating Templated Files --- .github/workflows/external_trigger.yml | 2 + .../workflows/package_trigger_scheduler.yml | 64 ++++++++++++++----- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c1fd1e4d..aff8c1cf 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -11,6 +11,8 @@ jobs: - name: External Trigger if: github.ref == 'refs/heads/jammy' + env: + SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} run: | printf "# External trigger for docker-baseimage-ubuntu\n\n" >> $GITHUB_STEP_SUMMARY echo "Type is \`os\`" >> $GITHUB_STEP_SUMMARY diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index fbc3024e..f8d61406 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -14,6 +14,8 @@ jobs: fetch-depth: '0' - name: Package Trigger Scheduler + env: + SKIP_PACKAGE_TRIGGER: ${{ vars.SKIP_PACKAGE_TRIGGER }} run: | printf "# Package trigger scheduler for docker-baseimage-ubuntu\n\n" >> $GITHUB_STEP_SUMMARY printf "Found the branches:\n\n%s\n" "$(git for-each-ref --format='- %(refname:lstrip=3)' refs/remotes)" >> $GITHUB_STEP_SUMMARY @@ -24,27 +26,57 @@ jobs: continue fi printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY - ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/jenkins-vars.yml | yq -r '.ls_branch') - if [ "${br}" == "${ls_branch}" ]; then + JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/jenkins-vars.yml) + if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY - if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/.github/workflows/package_trigger.yml > /dev/null 2>&1; then - echo "Triggering package trigger workflow for branch ${br}" >> $GITHUB_STEP_SUMMARY + if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif grep -q "^baseimage-ubuntu_${br}" <<< "${SKIP_PACKAGE_TRIGGER}"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`baseimage-ubuntu_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + else + echo "> [!NOTE]" >> $GITHUB_STEP_SUMMARY + echo "> Triggering package trigger for branch ${br}" >> $GITHUB_STEP_SUMMARY + printf "> To disable, add \`baseimage-ubuntu_%s\` into the Github organizational variable \`SKIP_PACKAGE_TRIGGER\`.\n\n" "${br}" >> $GITHUB_STEP_SUMMARY triggered_branches="${triggered_branches}${br} " + response=$(curl -iX POST \ + https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/${br}/buildWithParameters?PACKAGE_CHECK=true \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY + echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY + sleep 10 + buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url') + buildurl="${buildurl%$'\r'}" + echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY + echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY curl -iX POST \ - -H "Authorization: token ${{ secrets.CR_PAT }}" \ - -H "Accept: application/vnd.github.v3+json" \ - -d "{\"ref\":\"refs/heads/${br}\"}" \ - https://api.github.com/repos/linuxserver/docker-baseimage-ubuntu/actions/workflows/package_trigger.yml/dispatches - sleep 30 - else - echo "Skipping branch ${br} due to no package trigger workflow present." >> $GITHUB_STEP_SUMMARY + "${buildurl}submitDescription" \ + --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ + --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ + --data-urlencode "Submit=Submit" + sleep 20 fi else echo "Skipping branch ${br} due to being detected as dev branch." >> $GITHUB_STEP_SUMMARY fi done - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" - echo "**** Notifying Discord ****" - curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Package Check Build(s) Triggered for baseimage-ubuntu** \n**Branch(es):** '"${triggered_branches}"' \n**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-baseimage-ubuntu/activity/"' \n"}], - "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then + if [[ -n "${triggered_branches}" ]]; then + NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n" + fi + if [[ -n "${skipped_branches}" ]]; then + NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n" + fi + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" + echo "**** Notifying Discord ****" + curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, + "description": "**Package Check Build(s) Triggered for baseimage-ubuntu** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-baseimage-ubuntu/activity/"' \n"}], + "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} + fi From 93b4c6be0e8e1611d1611586695cecec45992df6 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Oct 2024 23:36:12 +0000 Subject: [PATCH 37/72] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 2506e184..a3ff6f5f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -6,7 +6,7 @@ base-files 12ubuntu4.7 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1.1 deb bsdutils 1:2.37.2-4ubuntu3.4 deb -ca-certificates 20230311ubuntu0.22.04.1 deb +ca-certificates 20240203~22.04.1 deb catatonit 0.1.7-1 deb coreutils 8.32-4.1ubuntu1.2 deb cron 3.0pl1-137ubuntu3 deb From 7a36582b4caa9637e112f8d9f46c8c7ec9aa55ff Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 6 Dec 2024 14:05:26 +0000 Subject: [PATCH 38/72] Use alpine:3 for rootfs stage --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f761a5be..dcd3bb20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.17 as rootfs-stage +FROM alpine:3 as rootfs-stage # environment ENV REL=jammy diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index dda53286..62b08adb 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM alpine:3.17 as rootfs-stage +FROM alpine:3 as rootfs-stage # environment ENV REL=jammy From 6c8b721bf3b3362e2c91d5389d6c2f8930e0a1ba Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 10 Dec 2024 07:57:44 +0000 Subject: [PATCH 39/72] Bot Updating Templated Files --- Jenkinsfile | 241 ++++++++++++++++++++++++++++++++-------------------- 1 file changed, 148 insertions(+), 93 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 343eacf8..c6897c6b 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { } // Input to determine if this is a package check parameters { - string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') + string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') } // Configuration for the variables used for this specific repo environment { @@ -189,6 +189,7 @@ pipeline { env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.META_TAG = 'jammy-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER env.EXT_RELEASE_TAG = 'jammy-version-' + env.EXT_RELEASE_CLEAN + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -213,6 +214,7 @@ pipeline { env.META_TAG = 'jammy-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA env.EXT_RELEASE_TAG = 'jammy-version-' + env.EXT_RELEASE_CLEAN env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -237,6 +239,7 @@ pipeline { env.EXT_RELEASE_TAG = 'jammy-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/' + env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' } } } @@ -506,8 +509,40 @@ pipeline { --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } + } } } // Build MultiArch Docker containers for push to LS Repo @@ -537,8 +572,40 @@ pipeline { --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } + } } } stage('Build ARM64') { @@ -547,10 +614,6 @@ pipeline { } steps { echo "Running on node: ${NODE_NAME}" - echo 'Logging into Github' - sh '''#! /bin/bash - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - ''' sh "docker buildx build \ --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ --label \"org.opencontainers.image.authors=linuxserver.io\" \ @@ -565,18 +628,47 @@ pipeline { --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false \ + --provenance=false --sbom=false --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" - retry_backoff(5,5) { - sh "docker push ghcr.io/linuxserver/lsiodev-buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}" + sh '''#! /bin/bash + set -e + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + done + ''' + withCredentials([ + [ + $class: 'UsernamePasswordMultiBinding', + credentialsId: 'Quay.io-Robot', + usernameVariable: 'QUAYUSER', + passwordVariable: 'QUAYPASS' + ] + ]) { + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin + echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin + echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin + echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin + if [[ "${PACKAGE_CHECK}" != "true" ]]; then + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & + done + wait + fi + ''' + } } sh '''#! /bin/bash containers=$(docker ps -aq) if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : ''' + docker system prune -af --volumes || : + ''' } } } @@ -726,37 +818,23 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do - docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG} - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:jammy - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER} - fi - docker push ${PUSHIMAGE}:jammy - docker push ${PUSHIMAGE}:${META_TAG} - docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker push ${PUSHIMAGE}:${SEMVER} - fi + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}" + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then + CACHEIMAGE=${i} + fi done - ''' - } + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:jammy -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + fi + done + ''' } } } @@ -767,57 +845,34 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - 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} --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 - docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-jammy - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-jammy - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER} - docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - docker push ${MANIFESTIMAGE}:amd64-${META_TAG} - docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} - docker push ${MANIFESTIMAGE}:amd64-jammy - docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker push ${MANIFESTIMAGE}:arm64v8-jammy - docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker push ${MANIFESTIMAGE}:amd64-${SEMVER} - docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - done - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker buildx imagetools create -t ${MANIFESTIMAGE}:jammy ${MANIFESTIMAGE}:amd64-jammy ${MANIFESTIMAGE}:arm64v8-jammy - docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi + retry_backoff(5,5) { + sh '''#! /bin/bash + set -e + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + IFS=',' read -ra CACHE <<< "$BUILDCACHE" + for i in "${CACHE[@]}"; do + if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then + CACHEIMAGE=${i} + fi done - ''' - } + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-jammy -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-jammy -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} + fi + done + for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do + docker buildx imagetools create -t ${MANIFESTIMAGE}:jammy ${MANIFESTIMAGE}:amd64-jammy ${MANIFESTIMAGE}:arm64v8-jammy + docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} + + docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} + if [ -n "${SEMVER}" ]; then + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} + fi + done + ''' } } } @@ -845,7 +900,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "jammy",\ "name": "'${META_TAG}'",\ - "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start + "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' From 78546c666527f10615f08f83aab01864d6376c4c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 10 Dec 2024 08:00:32 +0000 Subject: [PATCH 40/72] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 4 ++-- .github/workflows/package_trigger_scheduler.yml | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index cee91562..be079ba6 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -105,10 +105,10 @@ docker build \ -t linuxserver/baseimage-ubuntu:latest . ``` -The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static` +The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static` ```bash -docker run --rm --privileged multiarch/qemu-user-static:register --reset +docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset ``` Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`. diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index f8d61406..64804207 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -70,13 +70,14 @@ jobs: if [[ -n "${triggered_branches}" ]] || [[ -n "${skipped_branches}" ]]; then if [[ -n "${triggered_branches}" ]]; then NOTIFY_BRANCHES="**Triggered:** ${triggered_branches} \n" + NOTIFY_BUILD_URL="**Build URL:** https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-baseimage-ubuntu/activity/ \n" + echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" fi if [[ -n "${skipped_branches}" ]]; then NOTIFY_BRANCHES="${NOTIFY_BRANCHES}**Skipped:** ${skipped_branches} \n" fi - echo "**** Package check build(s) triggered for branch(es): ${triggered_branches} ****" echo "**** Notifying Discord ****" curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903, - "description": "**Package Check Build(s) Triggered for baseimage-ubuntu** \n'"${NOTIFY_BRANCHES}"'**Build URL:** '"https://ci.linuxserver.io/blue/organizations/jenkins/Docker-Pipeline-Builders%2Fdocker-baseimage-ubuntu/activity/"' \n"}], + "description": "**Package Check Build(s) for baseimage-ubuntu** \n'"${NOTIFY_BRANCHES}"''"${NOTIFY_BUILD_URL}"'"}], "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }} fi From f2d5c41d22b24511811c81e86d893cdbe405db0d Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 10 Dec 2024 08:04:03 +0000 Subject: [PATCH 41/72] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index a3ff6f5f..09c68588 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates 20240203~22.04.1 deb catatonit 0.1.7-1 deb coreutils 8.32-4.1ubuntu1.2 deb cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.18 deb +curl 7.81.0-1ubuntu1.19 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -51,7 +51,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.2 deb libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.18 deb +libcurl4 7.81.0-1ubuntu1.19 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.2 deb From 3e05afa4b847dcd22831aa87a00b98812efd4064 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 15 Dec 2024 18:32:03 +0000 Subject: [PATCH 42/72] Bot Updating Templated Files --- Jenkinsfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c6897c6b..17793da2 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -509,7 +509,7 @@ pipeline { --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -538,7 +538,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -572,7 +574,7 @@ pipeline { --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -601,7 +603,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -628,7 +632,7 @@ pipeline { --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=false --sbom=false --builder=container --load \ + --provenance=true --sbom=true --builder=container --load \ --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." sh '''#! /bin/bash set -e @@ -657,7 +661,9 @@ pipeline { for i in "${CACHE[@]}"; do docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & done - wait + for p in $(jobs -p); do + wait "$p" || { echo "job $p failed" >&2; exit 1; } + done fi ''' } @@ -900,7 +906,7 @@ pipeline { echo '{"tag_name":"'${META_TAG}'",\ "target_commitish": "jammy",\ "name": "'${META_TAG}'",\ - "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**OS Changes:**\\n\\n' > start + "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start printf '","draft": false,"prerelease": false}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' From b484a083472b57f6427dd212a7a4b336d411b8fc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Sun, 15 Dec 2024 18:34:42 +0000 Subject: [PATCH 43/72] Bot Updating Templated Files --- .../workflows/package_trigger_scheduler.yml | 27 +++++++++++++++---- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 64804207..6a52f387 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -27,9 +27,18 @@ jobs: fi printf "\n## Evaluating \`%s\`\n\n" ${br} >> $GITHUB_STEP_SUMMARY JENKINS_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/jenkins-vars.yml) - if [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then + if ! curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/Jenkinsfile >/dev/null 2>&1; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> No Jenkinsfile found. Branch is either deprecated or is an early dev branch." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [[ "${br}" == $(yq -r '.ls_branch' <<< "${JENKINS_VARS}") ]]; then echo "Branch appears to be live; checking workflow." >> $GITHUB_STEP_SUMMARY - if [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then + README_VARS=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-baseimage-ubuntu/${br}/readme-vars.yml) + if [[ $(yq -r '.project_deprecation_status' <<< "${README_VARS}") == "true" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Branch appears to be deprecated; skipping trigger." >> $GITHUB_STEP_SUMMARY + skipped_branches="${skipped_branches}${br} " + elif [[ $(yq -r '.skip_package_check' <<< "${JENKINS_VARS}") == "true" ]]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Skipping branch ${br} due to \`skip_package_check\` being set in \`jenkins-vars.yml\`." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " @@ -37,7 +46,7 @@ jobs: echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> Github organizational variable \`SKIP_PACKAGE_TRIGGER\` contains \`baseimage-ubuntu_${br}\`; skipping trigger." >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " - elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/${br}/lastBuild/api/json | jq -r '.building') == "true" ]; then + elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/${br}/lastBuild/api/json | jq -r '.building' 2>/dev/null) == "true" ]; then echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY echo "> There already seems to be an active build on Jenkins; skipping package trigger for ${br}" >> $GITHUB_STEP_SUMMARY skipped_branches="${skipped_branches}${br} " @@ -49,6 +58,11 @@ jobs: response=$(curl -iX POST \ https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-baseimage-ubuntu/job/${br}/buildWithParameters?PACKAGE_CHECK=true \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|") + if [[ -z "${response}" ]]; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Jenkins build could not be triggered. Skipping branch." + continue + fi echo "Jenkins [job queue url](${response%$'\r'})" >> $GITHUB_STEP_SUMMARY echo "Sleeping 10 seconds until job starts" >> $GITHUB_STEP_SUMMARY sleep 10 @@ -56,11 +70,14 @@ jobs: buildurl="${buildurl%$'\r'}" echo "Jenkins job [build url](${buildurl})" >> $GITHUB_STEP_SUMMARY echo "Attempting to change the Jenkins job description" >> $GITHUB_STEP_SUMMARY - curl -iX POST \ + if ! curl -ifX POST \ "${buildurl}submitDescription" \ --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \ --data-urlencode "description=GHA package trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \ - --data-urlencode "Submit=Submit" + --data-urlencode "Submit=Submit"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Unable to change the Jenkins job description." + fi sleep 20 fi else From b75eb2b0cfa64ed5aecff6cb897d7af6048bf917 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 Dec 2024 23:31:21 +0000 Subject: [PATCH 44/72] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 09c68588..83414b4c 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -10,7 +10,7 @@ ca-certificates 20240203~22.04.1 deb catatonit 0.1.7-1 deb coreutils 8.32-4.1ubuntu1.2 deb cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.19 deb +curl 7.81.0-1ubuntu1.20 deb dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb @@ -51,7 +51,7 @@ libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.2 deb libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.19 deb +libcurl4 7.81.0-1ubuntu1.20 deb libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb libdebconfclient0 0.261ubuntu1 deb libext2fs2 1.46.5-2ubuntu1.2 deb From 102a9d65051b8b8bd375dfec7fa97006d0ba4cad Mon Sep 17 00:00:00 2001 From: thespad Date: Fri, 17 Jan 2025 19:40:30 +0000 Subject: [PATCH 45/72] Switch Jammy to pre-release --- Jenkinsfile | 2 +- README.md | 31 +++++++++---------------------- jenkins-vars.yml | 2 +- readme-vars.yml | 31 +++++++++---------------------- 4 files changed, 20 insertions(+), 46 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 17793da2..66864dd4 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -907,7 +907,7 @@ pipeline { "target_commitish": "jammy",\ "name": "'${META_TAG}'",\ "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": false}' >> releasebody.json + printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } diff --git a/README.md b/README.md index d7b014e3..0fd45aa8 100644 --- a/README.md +++ b/README.md @@ -1,34 +1,21 @@ -[linuxserverurl]: https://linuxserver.io -[forumurl]: https://forum.linuxserver.io -[ircurl]: https://www.linuxserver.io/irc/ -[appurl]: https://cloud-images.ubuntu.com -[dockerfileurl]: https://github.com/linuxserver/docker-baseimage-ubuntu/blob/master/Dockerfile - - - -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl] - +[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) ## Contact information:- | Type | Address/Details | | :---: | --- | -| Discord | [Discord](https://discord.gg/YWrKVTn) | -| IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl] -| Forum | [LinuxServer.io forum][forumurl] | - -  -  - -[![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Xenial-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/xenial/Dockerfile) - -[![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Bionic-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/bionic/Dockerfile) +| Discord | [Discord](https://linuxserver.io/discord) | +| IRC | `#linuxserver.io` on irc.libera.chat | +| Forum | [Discourse](https://discourse.linuxserver.io/) | -[![](https://images.microbadger.com/badges/image/lsiobase/ubuntu.svg)](https://microbadger.com/images/lsiobase/ubuntu "Get your own image badge on microbadger.com") +A custom base image built with [Ubuntu Linux](https://ubuntu.com) and [s6-overlay](https://github.com/just-containers/s6-overlay). -A custom base image built with [Ubuntu cloud image][appurl] and [S6 overlay](https://github.com/just-containers/s6-overlay).. +- Support for using our base images in your own projects is provided on a Reasonable Endeavours basis, please see our [Support Policy](https://www.linuxserver.io/supportpolicy) for details. +- There is no `latest` tag for any of our base images, by design. We often make breaking changes between versions, and we don't publish release notes like we do for the downstream images. +- If you're intending to distribute an image using one of our bases, please read our [docs on container branding](https://docs.linuxserver.io/general/container-branding/) first. +- Ubuntu releases are supported for 5 years, after which we will stop building new base images for that version. The following line is only in this repo for loop testing: diff --git a/jenkins-vars.yml b/jenkins-vars.yml index b6b62ae6..fbe75a86 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,7 +3,7 @@ # jenkins variables project_name: docker-baseimage-ubuntu external_type: os -release_type: stable +release_type: prerelease release_tag: jammy ls_branch: jammy repo_vars: diff --git a/readme-vars.yml b/readme-vars.yml index 6ff391c4..aae30fa7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -4,35 +4,22 @@ project_name: baseimage-ubuntu full_custom_readme: | {% raw -%} - [linuxserverurl]: https://linuxserver.io - [forumurl]: https://forum.linuxserver.io - [ircurl]: https://www.linuxserver.io/irc/ - [appurl]: https://cloud-images.ubuntu.com - [dockerfileurl]: https://github.com/linuxserver/docker-baseimage-ubuntu/blob/master/Dockerfile - - - - [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png?v=4&s=4000)][linuxserverurl] - + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) ## Contact information:- | Type | Address/Details | | :---: | --- | - | Discord | [Discord](https://discord.gg/YWrKVTn) | - | IRC | freenode at `#linuxserver.io` more information at:- [IRC][ircurl] - | Forum | [LinuxServer.io forum][forumurl] | - -   -   - - [![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Xenial-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/xenial/Dockerfile) - - [![](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/Dockerfile-Bionic-green.png)](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/bionic/Dockerfile) + | Discord | [Discord](https://linuxserver.io/discord) | + | IRC | `#linuxserver.io` on irc.libera.chat | + | Forum | [Discourse](https://discourse.linuxserver.io/) | - [![](https://images.microbadger.com/badges/image/lsiobase/ubuntu.svg)](https://microbadger.com/images/lsiobase/ubuntu "Get your own image badge on microbadger.com") + A custom base image built with [Ubuntu Linux](https://ubuntu.com) and [s6-overlay](https://github.com/just-containers/s6-overlay). - A custom base image built with [Ubuntu cloud image][appurl] and [S6 overlay](https://github.com/just-containers/s6-overlay).. + - Support for using our base images in your own projects is provided on a Reasonable Endeavours basis, please see our [Support Policy](https://www.linuxserver.io/supportpolicy) for details. + - There is no `latest` tag for any of our base images, by design. We often make breaking changes between versions, and we don't publish release notes like we do for the downstream images. + - If you're intending to distribute an image using one of our bases, please read our [docs on container branding](https://docs.linuxserver.io/general/container-branding/) first. + - Ubuntu releases are supported for 5 years, after which we will stop building new base images for that version. The following line is only in this repo for loop testing: From 55f23757f117b9e5d93371579112550bd421f94b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 28 Jan 2025 23:27:51 +0000 Subject: [PATCH 46/72] Bot Updating Templated Files --- Jenkinsfile | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 66864dd4..ee1100e3 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -56,11 +56,21 @@ pipeline { steps{ echo "Running on node: ${NODE_NAME}" sh '''#! /bin/bash - containers=$(docker ps -aq) + echo "Pruning builder" + docker builder prune -f --builder container || : + containers=$(docker ps -q) if [[ -n "${containers}" ]]; then - docker stop ${containers} + BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') + for container in ${containers}; do + if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then + echo "skipping buildx container in docker stop" + else + echo "Stopping container ${container}" + docker stop ${container} + fi + done fi - docker system prune -af --volumes || : ''' + docker system prune -f --volumes || : ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -1084,12 +1094,21 @@ EOF } cleanup { sh '''#! /bin/bash - echo "Performing docker system prune!!" - containers=$(docker ps -aq) + echo "Pruning builder!!" + docker builder prune -f --builder container || : + containers=$(docker ps -q) if [[ -n "${containers}" ]]; then - docker stop ${containers} + BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') + for container in ${containers}; do + if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then + echo "skipping buildx container in docker stop" + else + echo "Stopping container ${container}" + docker stop ${container} + fi + done fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : ''' cleanWs() } From bc0b6ab84dabcf79e9275a14bb3e207fad96a4cf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 28 Jan 2025 23:29:52 +0000 Subject: [PATCH 47/72] Bot Updating Templated Files --- .github/CONTRIBUTING.md | 2 +- .github/ISSUE_TEMPLATE/config.yml | 2 +- .github/workflows/external_trigger.yml | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index be079ba6..d8471dd8 100755 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -6,7 +6,7 @@ * Read, and fill the Pull Request template * If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR * If the PR is addressing an existing issue include, closes #\, in the body of the PR commit message -* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn) +* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord) ## Common files diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml index 5e4d0251..dada5509 100755 --- a/.github/ISSUE_TEMPLATE/config.yml +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -1,7 +1,7 @@ blank_issues_enabled: false contact_links: - name: Discord chat support - url: https://discord.gg/YWrKVTn + url: https://linuxserver.io/discord about: Realtime support / chat with the community and the team. - name: Discourse discussion forum diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index aff8c1cf..c6cfa8ef 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -18,3 +18,8 @@ jobs: echo "Type is \`os\`" >> $GITHUB_STEP_SUMMARY echo "No external release, exiting" >> $GITHUB_STEP_SUMMARY exit 0 + if grep -q "^baseimage-ubuntu_jammy_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + echo "> [!WARNING]" >> $GITHUB_STEP_SUMMARY + echo "> Github organizational variable \`SKIP_EXTERNAL_TRIGGER\` matches current external release; skipping trigger." >> $GITHUB_STEP_SUMMARY + exit 0 + fi From a95cb7b09d800ac04fb3bd361d97eb9bd24728b1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 28 Jan 2025 23:34:06 +0000 Subject: [PATCH 48/72] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 83414b4c..208179fd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -84,10 +84,10 @@ libnpth0 1.6-3build2 deb libnsl2 1.3.0-2build2 deb libonig5 6.9.7.1-2build1 deb libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.4 deb -libpam-modules-bin 1.4.0-11ubuntu2.4 deb -libpam-runtime 1.4.0-11ubuntu2.4 deb -libpam0g 1.4.0-11ubuntu2.4 deb +libpam-modules 1.4.0-11ubuntu2.5 deb +libpam-modules-bin 1.4.0-11ubuntu2.5 deb +libpam-runtime 1.4.0-11ubuntu2.5 deb +libpam0g 1.4.0-11ubuntu2.5 deb libpcre2-8-0 10.39-3ubuntu0.1 deb libpcre3 2:8.39-13ubuntu0.22.04.1 deb libprocps8 2:3.3.17-6ubuntu2.1 deb From ad3fd4af792f587db6629eed206c827c857fa9f9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Feb 2025 23:29:40 +0000 Subject: [PATCH 49/72] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 208179fd..43dd5909 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -139,7 +139,7 @@ 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.1 deb +tzdata 2024b-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3.4 deb From f063e307f4406b8c96f82eb63140071d1e99504c Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 Feb 2025 23:29:43 +0000 Subject: [PATCH 50/72] Bot Updating Templated Files --- Jenkinsfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index ee1100e3..9838a814 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -70,7 +70,9 @@ pipeline { fi done fi - docker system prune -f --volumes || : ''' + docker system prune -f --volumes || : + docker image prune -af || : + ''' script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( @@ -683,7 +685,8 @@ pipeline { if [[ -n "${containers}" ]]; then docker stop ${containers} fi - docker system prune -af --volumes || : + docker system prune -f --volumes || : + docker image prune -af || : ''' } } @@ -1109,6 +1112,7 @@ EOF done fi docker system prune -f --volumes || : + docker image prune -af || : ''' cleanWs() } From 2dfcca3d0a11eb7469eed1bc44102f667db60e24 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 11 Feb 2025 23:32:55 +0000 Subject: [PATCH 51/72] Bot Updating Package Versions --- package_versions.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 43dd5909..3a00c5bd 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -45,8 +45,8 @@ libblkid1 2.37.2-4ubuntu3.4 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.8 deb -libc6 2.35-0ubuntu3.8 deb +libc-bin 2.35-0ubuntu3.9 deb +libc6 2.35-0ubuntu3.9 deb libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.1 deb libcom-err2 1.46.5-2ubuntu1.2 deb @@ -61,14 +61,14 @@ libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.5 deb libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.4 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.5 deb libhogweed6 3.7.3-1build2 deb libidn2-0 2.3.2-2build1 deb libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.4 deb +libk5crypto3 1.19.2-2ubuntu0.5 deb libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.4 deb -libkrb5support0 1.19.2-2ubuntu0.4 deb +libkrb5-3 1.19.2-2ubuntu0.5 deb +libkrb5support0 1.19.2-2ubuntu0.5 deb libksba8 1.6.0-2ubuntu0.2 deb libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.2 deb libldap-common 2.5.18+dfsg-0ubuntu0.22.04.2 deb @@ -97,7 +97,7 @@ librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb -libseccomp2 2.5.3-2ubuntu2 deb +libseccomp2 2.5.3-2ubuntu3~22.04.1 deb libselinux1 3.3-1build2 deb libsemanage-common 3.3-1build2 deb libsemanage2 3.3-1build2 deb @@ -118,7 +118,7 @@ libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.8 deb +locales 2.35-0ubuntu3.9 deb login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.2 deb lsb-base 11.1.0ubuntu4 deb From a11d6df2b2ee59f340ee9df0a57c7bdbda094c7e Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 18 Feb 2025 23:30:40 +0000 Subject: [PATCH 52/72] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3a00c5bd..8ef3e1ec 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -109,7 +109,7 @@ libssh-4 0.9.6-2ubuntu0.22.04.3 deb libssl3 3.0.2-0ubuntu1.18 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.12 deb -libtasn1-6 4.18.0-4build1 deb +libtasn1-6 4.18.0-4ubuntu0.1 deb libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb @@ -139,7 +139,7 @@ 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 2024b-0ubuntu0.22.04 deb +tzdata 2024b-0ubuntu0.22.04.1 deb ubuntu-keyring 2021.03.26 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3.4 deb From 18627d8216e9a7987cdbbb2fc3c7d115267af586 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 25 Feb 2025 23:32:14 +0000 Subject: [PATCH 53/72] Bot Updating Package Versions --- package_versions.txt | 294 ++++++++++++++++++++++--------------------- 1 file changed, 148 insertions(+), 146 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8ef3e1ec..b26aad26 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,146 +1,148 @@ -NAME VERSION TYPE -adduser 3.118ubuntu5 deb -apt 2.4.13 deb -apt-utils 2.4.13 deb -base-files 12ubuntu4.7 deb -base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1.1 deb -bsdutils 1:2.37.2-4ubuntu3.4 deb -ca-certificates 20240203~22.04.1 deb -catatonit 0.1.7-1 deb -coreutils 8.32-4.1ubuntu1.2 deb -cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.20 deb -dash 0.5.11+git20210903+057cd650a4ed-3build1 deb -debconf 1.5.79ubuntu1 deb -debianutils 5.5-1ubuntu2 deb -diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.1 deb -dpkg 1.21.1ubuntu2.3 deb -e2fsprogs 1.46.5-2ubuntu1.2 deb -findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.3.0-1ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.1 deb -gnupg-l10n 2.2.27-3ubuntu2.1 deb -gnupg-utils 2.2.27-3ubuntu2.1 deb -gpg 2.2.27-3ubuntu2.1 deb -gpg-agent 2.2.27-3ubuntu2.1 deb -gpg-wks-client 2.2.27-3ubuntu2.1 deb -gpg-wks-server 2.2.27-3ubuntu2.1 deb -gpgconf 2.2.27-3ubuntu2.1 deb -gpgsm 2.2.27-3ubuntu2.1 deb -gpgv 2.2.27-3ubuntu2.1 deb -grep 3.7-1build1 deb -gzip 1.10-4ubuntu4.1 deb -hostname 3.23ubuntu2 deb -init-system-helpers 1.62 deb -jq 1.6-2.1ubuntu3 deb -libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.13 deb -libassuan0 2.5.5-1build1 deb -libattr1 1:2.5.1-1build1 deb -libaudit-common 1:3.0.7-1build1 deb -libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3.4 deb -libbrotli1 1.0.9-2build6 deb -libbsd0 0.11.5-1 deb -libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.9 deb -libc6 2.35-0ubuntu3.9 deb -libcap-ng0 0.7.9-2.2build3 deb -libcap2 1:2.44-1ubuntu0.22.04.1 deb -libcom-err2 1.46.5-2ubuntu1.2 deb -libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.20 deb -libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb -libdebconfclient0 0.261ubuntu1 deb -libext2fs2 1.46.5-2ubuntu1.2 deb -libffi8 3.4.2-4 deb -libgcc-s1 12.3.0-1ubuntu1~22.04 deb -libgcrypt20 1.9.4-3ubuntu3 deb -libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.5 deb -libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.5 deb -libhogweed6 3.7.3-1build2 deb -libidn2-0 2.3.2-2build1 deb -libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.5 deb -libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.5 deb -libkrb5support0 1.19.2-2ubuntu0.5 deb -libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.2 deb -libldap-common 2.5.18+dfsg-0ubuntu0.22.04.2 deb -liblz4-1 1.9.3-2build2 deb -liblzma5 5.2.5-2ubuntu1 deb -libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3.4 deb -libncurses6 6.3-2ubuntu0.1 deb -libncursesw6 6.3-2ubuntu0.1 deb -libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1ubuntu0.2 deb -libnpth0 1.6-3build2 deb -libnsl2 1.3.0-2build2 deb -libonig5 6.9.7.1-2build1 deb -libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.5 deb -libpam-modules-bin 1.4.0-11ubuntu2.5 deb -libpam-runtime 1.4.0-11ubuntu2.5 deb -libpam0g 1.4.0-11ubuntu2.5 deb -libpcre2-8-0 10.39-3ubuntu0.1 deb -libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2.1 deb -libpsl5 0.21.0-1.2build2 deb -libreadline8 8.1.2-1 deb -librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb -libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb -libseccomp2 2.5.3-2ubuntu3~22.04.1 deb -libselinux1 3.3-1build2 deb -libsemanage-common 3.3-1build2 deb -libsemanage2 3.3-1build2 deb -libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3.4 deb -libsqlite3-0 3.37.2-2ubuntu0.3 deb -libss2 1.46.5-2ubuntu1.2 deb -libssh-4 0.9.6-2ubuntu0.22.04.3 deb -libssl3 3.0.2-0ubuntu1.18 deb -libstdc++6 12.3.0-1ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.12 deb -libtasn1-6 4.18.0-4ubuntu0.1 deb -libtinfo6 6.3-2ubuntu0.1 deb -libtirpc-common 1.3.2-2ubuntu0.1 deb -libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.12 deb -libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3.4 deb -libxxhash0 0.8.1-1 deb -libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.9 deb -login 1:4.8.1-2ubuntu2.2 deb -logsave 1.46.5-2ubuntu1.2 deb -lsb-base 11.1.0ubuntu4 deb -mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3.4 deb -ncurses-base 6.3-2ubuntu0.1 deb -ncurses-bin 6.3-2ubuntu0.1 deb -netcat 1.218-4ubuntu1 deb -netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.18 deb -passwd 1:4.8.1-2ubuntu2.2 deb -perl-base 5.34.0-3ubuntu1.3 deb -pinentry-curses 1.1.1-1build2 deb -procps 2:3.3.17-6ubuntu2.1 deb -publicsuffix 20211207.1025-1 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 2024b-0ubuntu0.22.04.1 deb -ubuntu-keyring 2021.03.26 deb -usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3.4 deb -zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb +NAME VERSION TYPE +adduser 3.118ubuntu5 deb +apt 2.4.13 deb +apt-utils 2.4.13 deb +base-files 12ubuntu4.7 deb +base-passwd 3.5.52build1 deb +bash 5.1-6ubuntu1.1 deb +bash 5.1.16 binary +bsdutils 1:2.37.2-4ubuntu3.4 deb +ca-certificates 20240203~22.04.1 deb +catatonit 0.1.7-1 deb +coreutils 8.32-4.1ubuntu1.2 deb +cron 3.0pl1-137ubuntu3 deb +curl 7.81.0-1ubuntu1.20 deb +dash 0.5.11+git20210903+057cd650a4ed-3build1 deb +debconf 1.5.79ubuntu1 deb +debianutils 5.5-1ubuntu2 deb +diffutils 1:3.8-0ubuntu2 deb +dirmngr 2.2.27-3ubuntu2.1 deb +dpkg 1.21.1ubuntu2.3 deb +e2fsprogs 1.46.5-2ubuntu1.2 deb +findutils 4.8.0-1ubuntu3 deb +gcc-12-base 12.3.0-1ubuntu1~22.04 deb +gnupg 2.2.27-3ubuntu2.1 deb +gnupg-l10n 2.2.27-3ubuntu2.1 deb +gnupg-utils 2.2.27-3ubuntu2.1 deb +gpg 2.2.27-3ubuntu2.1 deb +gpg-agent 2.2.27-3ubuntu2.1 deb +gpg-wks-client 2.2.27-3ubuntu2.1 deb +gpg-wks-server 2.2.27-3ubuntu2.1 deb +gpgconf 2.2.27-3ubuntu2.1 deb +gpgsm 2.2.27-3ubuntu2.1 deb +gpgv 2.2.27-3ubuntu2.1 deb +grep 3.7-1build1 deb +gzip 1.10 binary +gzip 1.10-4ubuntu4.1 deb +hostname 3.23ubuntu2 deb +init-system-helpers 1.62 deb +jq 1.6-2.1ubuntu3 deb +libacl1 2.3.1-1 deb +libapt-pkg6.0 2.4.13 deb +libassuan0 2.5.5-1build1 deb +libattr1 1:2.5.1-1build1 deb +libaudit-common 1:3.0.7-1build1 deb +libaudit1 1:3.0.7-1build1 deb +libblkid1 2.37.2-4ubuntu3.4 deb +libbrotli1 1.0.9-2build6 deb +libbsd0 0.11.5-1 deb +libbz2-1.0 1.0.8-5build1 deb +libc-bin 2.35-0ubuntu3.9 deb +libc6 2.35-0ubuntu3.9 deb +libcap-ng0 0.7.9-2.2build3 deb +libcap2 1:2.44-1ubuntu0.22.04.2 deb +libcom-err2 1.46.5-2ubuntu1.2 deb +libcrypt1 1:4.4.27-1 deb +libcurl4 7.81.0-1ubuntu1.20 deb +libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb +libdebconfclient0 0.261ubuntu1 deb +libext2fs2 1.46.5-2ubuntu1.2 deb +libffi8 3.4.2-4 deb +libgcc-s1 12.3.0-1ubuntu1~22.04 deb +libgcrypt20 1.9.4-3ubuntu3 deb +libgmp10 2:6.2.1+dfsg-3ubuntu1 deb +libgnutls30 3.7.3-4ubuntu1.6 deb +libgpg-error0 1.43-3 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.5 deb +libhogweed6 3.7.3-1build2 deb +libidn2-0 2.3.2-2build1 deb +libjq1 1.6-2.1ubuntu3 deb +libk5crypto3 1.19.2-2ubuntu0.5 deb +libkeyutils1 1.6.1-2ubuntu3 deb +libkrb5-3 1.19.2-2ubuntu0.5 deb +libkrb5support0 1.19.2-2ubuntu0.5 deb +libksba8 1.6.0-2ubuntu0.2 deb +libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.3 deb +libldap-common 2.5.18+dfsg-0ubuntu0.22.04.3 deb +liblz4-1 1.9.3-2build2 deb +liblzma5 5.2.5-2ubuntu1 deb +libmd0 1.0.4-1build1 deb +libmount1 2.37.2-4ubuntu3.4 deb +libncurses6 6.3-2ubuntu0.1 deb +libncursesw6 6.3-2ubuntu0.1 deb +libnettle8 3.7.3-1build2 deb +libnghttp2-14 1.43.0-1ubuntu0.2 deb +libnpth0 1.6-3build2 deb +libnsl2 1.3.0-2build2 deb +libonig5 6.9.7.1-2build1 deb +libp11-kit0 0.24.0-6build1 deb +libpam-modules 1.4.0-11ubuntu2.5 deb +libpam-modules-bin 1.4.0-11ubuntu2.5 deb +libpam-runtime 1.4.0-11ubuntu2.5 deb +libpam0g 1.4.0-11ubuntu2.5 deb +libpcre2-8-0 10.39-3ubuntu0.1 deb +libpcre3 2:8.39-13ubuntu0.22.04.1 deb +libprocps8 2:3.3.17-6ubuntu2.1 deb +libpsl5 0.21.0-1.2build2 deb +libreadline8 8.1.2-1 deb +librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb +libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb +libseccomp2 2.5.3-2ubuntu3~22.04.1 deb +libselinux1 3.3-1build2 deb +libsemanage-common 3.3-1build2 deb +libsemanage2 3.3-1build2 deb +libsepol2 3.3-1build1 deb +libsmartcols1 2.37.2-4ubuntu3.4 deb +libsqlite3-0 3.37.2-2ubuntu0.3 deb +libss2 1.46.5-2ubuntu1.2 deb +libssh-4 0.9.6-2ubuntu0.22.04.3 deb +libssl3 3.0.2-0ubuntu1.19 deb +libstdc++6 12.3.0-1ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.12 deb +libtasn1-6 4.18.0-4ubuntu0.1 deb +libtinfo6 6.3-2ubuntu0.1 deb +libtirpc-common 1.3.2-2ubuntu0.1 deb +libtirpc3 1.3.2-2ubuntu0.1 deb +libudev1 249.11-0ubuntu3.12 deb +libunistring2 1.0-1 deb +libuuid1 2.37.2-4ubuntu3.4 deb +libxxhash0 0.8.1-1 deb +libzstd1 1.4.8+dfsg-3build1 deb +locales 2.35-0ubuntu3.9 deb +login 1:4.8.1-2ubuntu2.2 deb +logsave 1.46.5-2ubuntu1.2 deb +lsb-base 11.1.0ubuntu4 deb +mawk 1.3.4.20200120-3 deb +mount 2.37.2-4ubuntu3.4 deb +ncurses-base 6.3-2ubuntu0.1 deb +ncurses-bin 6.3-2ubuntu0.1 deb +netcat 1.218-4ubuntu1 deb +netcat-openbsd 1.218-4ubuntu1 deb +openssl 3.0.2-0ubuntu1.19 deb +passwd 1:4.8.1-2ubuntu2.2 deb +perl-base 5.34.0-3ubuntu1.3 deb +pinentry-curses 1.1.1-1build2 deb +procps 2:3.3.17-6ubuntu2.1 deb +publicsuffix 20211207.1025-1 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 2024b-0ubuntu0.22.04.1 deb +ubuntu-keyring 2021.03.26 deb +usrmerge 25ubuntu2 deb +util-linux 2.37.2-4ubuntu3.4 deb +zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From 7e6fe5d034c960a747f4b5a72858583940a6ea18 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 4 Mar 2025 23:32:08 +0000 Subject: [PATCH 54/72] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index b26aad26..8403618e 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -63,14 +63,14 @@ libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.6 deb libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.5 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.6 deb libhogweed6 3.7.3-1build2 deb libidn2-0 2.3.2-2build1 deb libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.5 deb +libk5crypto3 1.19.2-2ubuntu0.6 deb libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.5 deb -libkrb5support0 1.19.2-2ubuntu0.5 deb +libkrb5-3 1.19.2-2ubuntu0.6 deb +libkrb5support0 1.19.2-2ubuntu0.6 deb libksba8 1.6.0-2ubuntu0.2 deb libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.3 deb libldap-common 2.5.18+dfsg-0ubuntu0.22.04.3 deb From d31a2ac95c1cc9789be15a9f6000552525cb47cf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 1 Apr 2025 23:32:57 +0000 Subject: [PATCH 55/72] Bot Updating Package Versions --- package_versions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 8403618e..778c63d1 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -110,12 +110,12 @@ libss2 1.46.5-2ubuntu1.2 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb libssl3 3.0.2-0ubuntu1.19 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.12 deb +libsystemd0 249.11-0ubuntu3.15 deb libtasn1-6 4.18.0-4ubuntu0.1 deb libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.12 deb +libudev1 249.11-0ubuntu3.15 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb @@ -141,7 +141,7 @@ 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 2024b-0ubuntu0.22.04.1 deb +tzdata 2025a-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3.4 deb From 6a8fe2bb70304f5e0fc48707e925604c255f0ef5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Apr 2025 23:34:48 +0000 Subject: [PATCH 56/72] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 778c63d1..c648809f 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -16,21 +16,21 @@ dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.1 deb +dirmngr 2.2.27-3ubuntu2.3 deb dpkg 1.21.1ubuntu2.3 deb e2fsprogs 1.46.5-2ubuntu1.2 deb findutils 4.8.0-1ubuntu3 deb gcc-12-base 12.3.0-1ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.1 deb -gnupg-l10n 2.2.27-3ubuntu2.1 deb -gnupg-utils 2.2.27-3ubuntu2.1 deb -gpg 2.2.27-3ubuntu2.1 deb -gpg-agent 2.2.27-3ubuntu2.1 deb -gpg-wks-client 2.2.27-3ubuntu2.1 deb -gpg-wks-server 2.2.27-3ubuntu2.1 deb -gpgconf 2.2.27-3ubuntu2.1 deb -gpgsm 2.2.27-3ubuntu2.1 deb -gpgv 2.2.27-3ubuntu2.1 deb +gnupg 2.2.27-3ubuntu2.3 deb +gnupg-l10n 2.2.27-3ubuntu2.3 deb +gnupg-utils 2.2.27-3ubuntu2.3 deb +gpg 2.2.27-3ubuntu2.3 deb +gpg-agent 2.2.27-3ubuntu2.3 deb +gpg-wks-client 2.2.27-3ubuntu2.3 deb +gpg-wks-server 2.2.27-3ubuntu2.3 deb +gpgconf 2.2.27-3ubuntu2.3 deb +gpgsm 2.2.27-3ubuntu2.3 deb +gpgv 2.2.27-3ubuntu2.3 deb grep 3.7-1build1 deb gzip 1.10 binary gzip 1.10-4ubuntu4.1 deb @@ -141,7 +141,7 @@ 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 2025a-0ubuntu0.22.04 deb +tzdata 2025b-0ubuntu0.22.04 deb ubuntu-keyring 2021.03.26 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3.4 deb From 949149983fee5e00360331ed0d6b8e71af1ee835 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Apr 2025 23:33:43 +0000 Subject: [PATCH 57/72] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index c648809f..08835507 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -132,7 +132,7 @@ netcat 1.218-4ubuntu1 deb netcat-openbsd 1.218-4ubuntu1 deb openssl 3.0.2-0ubuntu1.19 deb passwd 1:4.8.1-2ubuntu2.2 deb -perl-base 5.34.0-3ubuntu1.3 deb +perl-base 5.34.0-3ubuntu1.4 deb pinentry-curses 1.1.1-1build2 deb procps 2:3.3.17-6ubuntu2.1 deb publicsuffix 20211207.1025-1 deb From 9816352c2313e89020fa11d130020d7c28e0b54b Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 29 Apr 2025 23:31:59 +0000 Subject: [PATCH 58/72] Bot Updating Package Versions --- package_versions.txt | 294 +++++++++++++++++++++---------------------- 1 file changed, 146 insertions(+), 148 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 08835507..900e31fa 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,148 +1,146 @@ -NAME VERSION TYPE -adduser 3.118ubuntu5 deb -apt 2.4.13 deb -apt-utils 2.4.13 deb -base-files 12ubuntu4.7 deb -base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1.1 deb -bash 5.1.16 binary -bsdutils 1:2.37.2-4ubuntu3.4 deb -ca-certificates 20240203~22.04.1 deb -catatonit 0.1.7-1 deb -coreutils 8.32-4.1ubuntu1.2 deb -cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.20 deb -dash 0.5.11+git20210903+057cd650a4ed-3build1 deb -debconf 1.5.79ubuntu1 deb -debianutils 5.5-1ubuntu2 deb -diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.3 deb -dpkg 1.21.1ubuntu2.3 deb -e2fsprogs 1.46.5-2ubuntu1.2 deb -findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.3.0-1ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.3 deb -gnupg-l10n 2.2.27-3ubuntu2.3 deb -gnupg-utils 2.2.27-3ubuntu2.3 deb -gpg 2.2.27-3ubuntu2.3 deb -gpg-agent 2.2.27-3ubuntu2.3 deb -gpg-wks-client 2.2.27-3ubuntu2.3 deb -gpg-wks-server 2.2.27-3ubuntu2.3 deb -gpgconf 2.2.27-3ubuntu2.3 deb -gpgsm 2.2.27-3ubuntu2.3 deb -gpgv 2.2.27-3ubuntu2.3 deb -grep 3.7-1build1 deb -gzip 1.10 binary -gzip 1.10-4ubuntu4.1 deb -hostname 3.23ubuntu2 deb -init-system-helpers 1.62 deb -jq 1.6-2.1ubuntu3 deb -libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.13 deb -libassuan0 2.5.5-1build1 deb -libattr1 1:2.5.1-1build1 deb -libaudit-common 1:3.0.7-1build1 deb -libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3.4 deb -libbrotli1 1.0.9-2build6 deb -libbsd0 0.11.5-1 deb -libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.9 deb -libc6 2.35-0ubuntu3.9 deb -libcap-ng0 0.7.9-2.2build3 deb -libcap2 1:2.44-1ubuntu0.22.04.2 deb -libcom-err2 1.46.5-2ubuntu1.2 deb -libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.20 deb -libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb -libdebconfclient0 0.261ubuntu1 deb -libext2fs2 1.46.5-2ubuntu1.2 deb -libffi8 3.4.2-4 deb -libgcc-s1 12.3.0-1ubuntu1~22.04 deb -libgcrypt20 1.9.4-3ubuntu3 deb -libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.6 deb -libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.6 deb -libhogweed6 3.7.3-1build2 deb -libidn2-0 2.3.2-2build1 deb -libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.6 deb -libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.6 deb -libkrb5support0 1.19.2-2ubuntu0.6 deb -libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.3 deb -libldap-common 2.5.18+dfsg-0ubuntu0.22.04.3 deb -liblz4-1 1.9.3-2build2 deb -liblzma5 5.2.5-2ubuntu1 deb -libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3.4 deb -libncurses6 6.3-2ubuntu0.1 deb -libncursesw6 6.3-2ubuntu0.1 deb -libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1ubuntu0.2 deb -libnpth0 1.6-3build2 deb -libnsl2 1.3.0-2build2 deb -libonig5 6.9.7.1-2build1 deb -libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.5 deb -libpam-modules-bin 1.4.0-11ubuntu2.5 deb -libpam-runtime 1.4.0-11ubuntu2.5 deb -libpam0g 1.4.0-11ubuntu2.5 deb -libpcre2-8-0 10.39-3ubuntu0.1 deb -libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2.1 deb -libpsl5 0.21.0-1.2build2 deb -libreadline8 8.1.2-1 deb -librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb -libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb -libseccomp2 2.5.3-2ubuntu3~22.04.1 deb -libselinux1 3.3-1build2 deb -libsemanage-common 3.3-1build2 deb -libsemanage2 3.3-1build2 deb -libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3.4 deb -libsqlite3-0 3.37.2-2ubuntu0.3 deb -libss2 1.46.5-2ubuntu1.2 deb -libssh-4 0.9.6-2ubuntu0.22.04.3 deb -libssl3 3.0.2-0ubuntu1.19 deb -libstdc++6 12.3.0-1ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.15 deb -libtasn1-6 4.18.0-4ubuntu0.1 deb -libtinfo6 6.3-2ubuntu0.1 deb -libtirpc-common 1.3.2-2ubuntu0.1 deb -libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.15 deb -libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3.4 deb -libxxhash0 0.8.1-1 deb -libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.9 deb -login 1:4.8.1-2ubuntu2.2 deb -logsave 1.46.5-2ubuntu1.2 deb -lsb-base 11.1.0ubuntu4 deb -mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3.4 deb -ncurses-base 6.3-2ubuntu0.1 deb -ncurses-bin 6.3-2ubuntu0.1 deb -netcat 1.218-4ubuntu1 deb -netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.19 deb -passwd 1:4.8.1-2ubuntu2.2 deb -perl-base 5.34.0-3ubuntu1.4 deb -pinentry-curses 1.1.1-1build2 deb -procps 2:3.3.17-6ubuntu2.1 deb -publicsuffix 20211207.1025-1 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 2025b-0ubuntu0.22.04 deb -ubuntu-keyring 2021.03.26 deb -usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3.4 deb -zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb +NAME VERSION TYPE +adduser 3.118ubuntu5 deb +apt 2.4.13 deb +apt-utils 2.4.13 deb +base-files 12ubuntu4.7 deb +base-passwd 3.5.52build1 deb +bash 5.1-6ubuntu1.1 deb +bsdutils 1:2.37.2-4ubuntu3.4 deb +ca-certificates 20240203~22.04.1 deb +catatonit 0.1.7-1 deb +coreutils 8.32-4.1ubuntu1.2 deb +cron 3.0pl1-137ubuntu3 deb +curl 7.81.0-1ubuntu1.20 deb +dash 0.5.11+git20210903+057cd650a4ed-3build1 deb +debconf 1.5.79ubuntu1 deb +debianutils 5.5-1ubuntu2 deb +diffutils 1:3.8-0ubuntu2 deb +dirmngr 2.2.27-3ubuntu2.3 deb +dpkg 1.21.1ubuntu2.3 deb +e2fsprogs 1.46.5-2ubuntu1.2 deb +findutils 4.8.0-1ubuntu3 deb +gcc-12-base 12.3.0-1ubuntu1~22.04 deb +gnupg 2.2.27-3ubuntu2.3 deb +gnupg-l10n 2.2.27-3ubuntu2.3 deb +gnupg-utils 2.2.27-3ubuntu2.3 deb +gpg 2.2.27-3ubuntu2.3 deb +gpg-agent 2.2.27-3ubuntu2.3 deb +gpg-wks-client 2.2.27-3ubuntu2.3 deb +gpg-wks-server 2.2.27-3ubuntu2.3 deb +gpgconf 2.2.27-3ubuntu2.3 deb +gpgsm 2.2.27-3ubuntu2.3 deb +gpgv 2.2.27-3ubuntu2.3 deb +grep 3.7-1build1 deb +gzip 1.10-4ubuntu4.1 deb +hostname 3.23ubuntu2 deb +init-system-helpers 1.62 deb +jq 1.6-2.1ubuntu3 deb +libacl1 2.3.1-1 deb +libapt-pkg6.0 2.4.13 deb +libassuan0 2.5.5-1build1 deb +libattr1 1:2.5.1-1build1 deb +libaudit-common 1:3.0.7-1build1 deb +libaudit1 1:3.0.7-1build1 deb +libblkid1 2.37.2-4ubuntu3.4 deb +libbrotli1 1.0.9-2build6 deb +libbsd0 0.11.5-1 deb +libbz2-1.0 1.0.8-5build1 deb +libc-bin 2.35-0ubuntu3.9 deb +libc6 2.35-0ubuntu3.9 deb +libcap-ng0 0.7.9-2.2build3 deb +libcap2 1:2.44-1ubuntu0.22.04.2 deb +libcom-err2 1.46.5-2ubuntu1.2 deb +libcrypt1 1:4.4.27-1 deb +libcurl4 7.81.0-1ubuntu1.20 deb +libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb +libdebconfclient0 0.261ubuntu1 deb +libext2fs2 1.46.5-2ubuntu1.2 deb +libffi8 3.4.2-4 deb +libgcc-s1 12.3.0-1ubuntu1~22.04 deb +libgcrypt20 1.9.4-3ubuntu3 deb +libgmp10 2:6.2.1+dfsg-3ubuntu1 deb +libgnutls30 3.7.3-4ubuntu1.6 deb +libgpg-error0 1.43-3 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.6 deb +libhogweed6 3.7.3-1build2 deb +libidn2-0 2.3.2-2build1 deb +libjq1 1.6-2.1ubuntu3 deb +libk5crypto3 1.19.2-2ubuntu0.6 deb +libkeyutils1 1.6.1-2ubuntu3 deb +libkrb5-3 1.19.2-2ubuntu0.6 deb +libkrb5support0 1.19.2-2ubuntu0.6 deb +libksba8 1.6.0-2ubuntu0.2 deb +libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.3 deb +libldap-common 2.5.18+dfsg-0ubuntu0.22.04.3 deb +liblz4-1 1.9.3-2build2 deb +liblzma5 5.2.5-2ubuntu1 deb +libmd0 1.0.4-1build1 deb +libmount1 2.37.2-4ubuntu3.4 deb +libncurses6 6.3-2ubuntu0.1 deb +libncursesw6 6.3-2ubuntu0.1 deb +libnettle8 3.7.3-1build2 deb +libnghttp2-14 1.43.0-1ubuntu0.2 deb +libnpth0 1.6-3build2 deb +libnsl2 1.3.0-2build2 deb +libonig5 6.9.7.1-2build1 deb +libp11-kit0 0.24.0-6build1 deb +libpam-modules 1.4.0-11ubuntu2.5 deb +libpam-modules-bin 1.4.0-11ubuntu2.5 deb +libpam-runtime 1.4.0-11ubuntu2.5 deb +libpam0g 1.4.0-11ubuntu2.5 deb +libpcre2-8-0 10.39-3ubuntu0.1 deb +libpcre3 2:8.39-13ubuntu0.22.04.1 deb +libprocps8 2:3.3.17-6ubuntu2.1 deb +libpsl5 0.21.0-1.2build2 deb +libreadline8 8.1.2-1 deb +librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb +libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb +libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb +libseccomp2 2.5.3-2ubuntu3~22.04.1 deb +libselinux1 3.3-1build2 deb +libsemanage-common 3.3-1build2 deb +libsemanage2 3.3-1build2 deb +libsepol2 3.3-1build1 deb +libsmartcols1 2.37.2-4ubuntu3.4 deb +libsqlite3-0 3.37.2-2ubuntu0.3 deb +libss2 1.46.5-2ubuntu1.2 deb +libssh-4 0.9.6-2ubuntu0.22.04.3 deb +libssl3 3.0.2-0ubuntu1.19 deb +libstdc++6 12.3.0-1ubuntu1~22.04 deb +libsystemd0 249.11-0ubuntu3.15 deb +libtasn1-6 4.18.0-4ubuntu0.1 deb +libtinfo6 6.3-2ubuntu0.1 deb +libtirpc-common 1.3.2-2ubuntu0.1 deb +libtirpc3 1.3.2-2ubuntu0.1 deb +libudev1 249.11-0ubuntu3.15 deb +libunistring2 1.0-1 deb +libuuid1 2.37.2-4ubuntu3.4 deb +libxxhash0 0.8.1-1 deb +libzstd1 1.4.8+dfsg-3build1 deb +locales 2.35-0ubuntu3.9 deb +login 1:4.8.1-2ubuntu2.2 deb +logsave 1.46.5-2ubuntu1.2 deb +lsb-base 11.1.0ubuntu4 deb +mawk 1.3.4.20200120-3 deb +mount 2.37.2-4ubuntu3.4 deb +ncurses-base 6.3-2ubuntu0.1 deb +ncurses-bin 6.3-2ubuntu0.1 deb +netcat 1.218-4ubuntu1 deb +netcat-openbsd 1.218-4ubuntu1 deb +openssl 3.0.2-0ubuntu1.19 deb +passwd 1:4.8.1-2ubuntu2.2 deb +perl-base 5.34.0-3ubuntu1.4 deb +pinentry-curses 1.1.1-1build2 deb +procps 2:3.3.17-6ubuntu2.1 deb +publicsuffix 20211207.1025-1 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 2025b-0ubuntu0.22.04 deb +ubuntu-keyring 2021.03.26 deb +usrmerge 25ubuntu2 deb +util-linux 2.37.2-4ubuntu3.4 deb +zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb From cd42f7fe4a4920f04dc8676e438097632f3f35e1 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Fri, 16 May 2025 11:53:40 -0400 Subject: [PATCH 59/72] add device perm fixing to base --- .../dependencies.d/init-adduser | 0 .../s6-overlay/s6-rc.d/init-device-perms/run | 37 +++++++++++++++++++ .../s6-overlay/s6-rc.d/init-device-perms/type | 1 + .../s6-overlay/s6-rc.d/init-device-perms/up | 1 + .../dependencies.d/init-device-perms | 0 .../s6-rc.d/user/contents.d/init-device-perms | 0 6 files changed, 39 insertions(+) create mode 100644 root/etc/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser create mode 100755 root/etc/s6-overlay/s6-rc.d/init-device-perms/run create mode 100644 root/etc/s6-overlay/s6-rc.d/init-device-perms/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-device-perms/up create mode 100644 root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-device-perms diff --git a/root/etc/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser b/root/etc/s6-overlay/s6-rc.d/init-device-perms/dependencies.d/init-adduser new file mode 100644 index 00000000..e69de29b diff --git a/root/etc/s6-overlay/s6-rc.d/init-device-perms/run b/root/etc/s6-overlay/s6-rc.d/init-device-perms/run new file mode 100755 index 00000000..8ba102e3 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-device-perms/run @@ -0,0 +1,37 @@ +#!/usr/bin/with-contenv bash +# shellcheck shell=bash + +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then + FILES=$(find ${ATTACHED_DEVICES_PERMS} -print 2>/dev/null) + + for i in ${FILES}; do + FILE_GID=$(stat -c '%g' "${i}") + FILE_UID=$(stat -c '%u' "${i}") + # check if user matches device + if id -u abc | grep -qw "${FILE_UID}"; then + echo "**** permissions for ${i} are good ****" + else + # check if group matches and that device has group rw + if id -G abc | grep -qw "${FILE_GID}" && [[ $(stat -c '%A' "${i}" | cut -b 5,6) == "rw" ]]; then + echo "**** permissions for ${i} are good ****" + # check if device needs to be added to group + elif ! id -G abc | grep -qw "${FILE_GID}"; then + # check if group needs to be created + GROUP_NAME=$(getent group "${FILE_GID}" | awk -F: '{print $1}') + if [[ -z "${GROUP_NAME}" ]]; then + GROUP_NAME="group$(head /dev/urandom | tr -dc 'a-z0-9' | head -c4)" + groupadd "${GROUP_NAME}" + groupmod -g "${FILE_GID}" "${GROUP_NAME}" + echo "**** creating group ${GROUP_NAME} with id ${FILE_GID} ****" + fi + echo "**** adding ${i} to group ${GROUP_NAME} with id ${FILE_GID} ****" + usermod -a -G "${GROUP_NAME}" abc + fi + # check if device has group rw + if [[ $(stat -c '%A' "${i}" | cut -b 5,6) != "rw" ]]; then + echo -e "**** The device ${i} does not have group read/write permissions, attempting to fix inside the container. ****" + chmod g+rw "${i}" + fi + fi + done +fi diff --git a/root/etc/s6-overlay/s6-rc.d/init-device-perms/type b/root/etc/s6-overlay/s6-rc.d/init-device-perms/type new file mode 100644 index 00000000..3d92b15f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-device-perms/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-device-perms/up b/root/etc/s6-overlay/s6-rc.d/init-device-perms/up new file mode 100644 index 00000000..050e0b29 --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-device-perms/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-device-perms/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms b/root/etc/s6-overlay/s6-rc.d/init-os-end/dependencies.d/init-device-perms new file mode 100644 index 00000000..e69de29b diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-device-perms b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-device-perms new file mode 100644 index 00000000..e69de29b From baed74b393df284be3209c7c632d90f33124afc7 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Fri, 16 May 2025 12:37:24 -0400 Subject: [PATCH 60/72] run only when env is set --- root/etc/s6-overlay/s6-rc.d/init-device-perms/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/init-device-perms/run b/root/etc/s6-overlay/s6-rc.d/init-device-perms/run index 8ba102e3..18412b87 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-device-perms/run +++ b/root/etc/s6-overlay/s6-rc.d/init-device-perms/run @@ -1,7 +1,7 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -if [[ -z ${LSIO_NON_ROOT_USER} ]]; then +if [[ -z ${LSIO_NON_ROOT_USER} ]] && [[ -n ${ATTACHED_DEVICES_PERMS} ]]; then FILES=$(find ${ATTACHED_DEVICES_PERMS} -print 2>/dev/null) for i in ${FILES}; do From 3f0f340be915df498b8ed165b1f4bbb10e261e20 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Fri, 16 May 2025 18:43:53 +0000 Subject: [PATCH 61/72] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 900e31fa..61c44164 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -70,8 +70,8 @@ libkeyutils1 1.6.1-2ubuntu3 deb libkrb5-3 1.19.2-2ubuntu0.6 deb libkrb5support0 1.19.2-2ubuntu0.6 deb libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.18+dfsg-0ubuntu0.22.04.3 deb -libldap-common 2.5.18+dfsg-0ubuntu0.22.04.3 deb +libldap-2.5-0 2.5.19+dfsg-0ubuntu0.22.04.1 deb +libldap-common 2.5.19+dfsg-0ubuntu0.22.04.1 deb liblz4-1 1.9.3-2build2 deb liblzma5 5.2.5-2ubuntu1 deb libmd0 1.0.4-1build1 deb From c9711b4b8241baf02532492aab3e01ec1ff3faf9 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 27 May 2025 23:32:34 +0000 Subject: [PATCH 62/72] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 61c44164..cec338e3 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -103,7 +103,7 @@ libsemanage-common 3.3-1build2 deb libsemanage2 3.3-1build2 deb libsepol2 3.3-1build1 deb libsmartcols1 2.37.2-4ubuntu3.4 deb -libsqlite3-0 3.37.2-2ubuntu0.3 deb +libsqlite3-0 3.37.2-2ubuntu0.4 deb libss2 1.46.5-2ubuntu1.2 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb libssl3 3.0.2-0ubuntu1.19 deb From 1084d53330945c2572d004a959eaeae6f68b92fc Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 3 Jun 2025 23:33:54 +0000 Subject: [PATCH 63/72] Bot Updating Package Versions --- package_versions.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index cec338e3..3e489409 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,7 +1,7 @@ NAME VERSION TYPE adduser 3.118ubuntu5 deb -apt 2.4.13 deb -apt-utils 2.4.13 deb +apt 2.4.14 deb +apt-utils 2.4.14 deb base-files 12ubuntu4.7 deb base-passwd 3.5.52build1 deb bash 5.1-6ubuntu1.1 deb @@ -36,7 +36,7 @@ hostname 3.23ubuntu2 deb init-system-helpers 1.62 deb jq 1.6-2.1ubuntu3 deb libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.13 deb +libapt-pkg6.0 2.4.14 deb libassuan0 2.5.5-1build1 deb libattr1 1:2.5.1-1build1 deb libaudit-common 1:3.0.7-1build1 deb @@ -45,8 +45,8 @@ libblkid1 2.37.2-4ubuntu3.4 deb libbrotli1 1.0.9-2build6 deb libbsd0 0.11.5-1 deb libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.9 deb -libc6 2.35-0ubuntu3.9 deb +libc-bin 2.35-0ubuntu3.10 deb +libc6 2.35-0ubuntu3.10 deb libcap-ng0 0.7.9-2.2build3 deb libcap2 1:2.44-1ubuntu0.22.04.2 deb libcom-err2 1.46.5-2ubuntu1.2 deb @@ -61,14 +61,14 @@ libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb libgnutls30 3.7.3-4ubuntu1.6 deb libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.6 deb +libgssapi-krb5-2 1.19.2-2ubuntu0.7 deb libhogweed6 3.7.3-1build2 deb libidn2-0 2.3.2-2build1 deb libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.6 deb +libk5crypto3 1.19.2-2ubuntu0.7 deb libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.6 deb -libkrb5support0 1.19.2-2ubuntu0.6 deb +libkrb5-3 1.19.2-2ubuntu0.7 deb +libkrb5support0 1.19.2-2ubuntu0.7 deb libksba8 1.6.0-2ubuntu0.2 deb libldap-2.5-0 2.5.19+dfsg-0ubuntu0.22.04.1 deb libldap-common 2.5.19+dfsg-0ubuntu0.22.04.1 deb @@ -118,7 +118,7 @@ libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.9 deb +locales 2.35-0ubuntu3.10 deb login 1:4.8.1-2ubuntu2.2 deb logsave 1.46.5-2ubuntu1.2 deb lsb-base 11.1.0ubuntu4 deb @@ -139,7 +139,7 @@ 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 2025b-0ubuntu0.22.04 deb +tzdata 2025b-0ubuntu0.22.04.1 deb ubuntu-keyring 2021.03.26 deb usrmerge 25ubuntu2 deb util-linux 2.37.2-4ubuntu3.4 deb From c23a38fb6a8bf1e41addfcdd6b2bdf9dfcbeb2b2 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 10 Jun 2025 23:32:15 +0000 Subject: [PATCH 64/72] Bot Updating Templated Files --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 9838a814..18d614fe 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -712,7 +712,7 @@ pipeline { docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ -v ${TEMPDIR}:/tmp \ - ghcr.io/anchore/syft:latest \ + ghcr.io/anchore/syft:v1.26.1 \ ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" From 3ff397424d7ab19c7fc237621bc0ed67455999d5 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 17 Jun 2025 23:33:39 +0000 Subject: [PATCH 65/72] Bot Updating Package Versions --- package_versions.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 3e489409..41b0cc44 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -108,12 +108,12 @@ libss2 1.46.5-2ubuntu1.2 deb libssh-4 0.9.6-2ubuntu0.22.04.3 deb libssl3 3.0.2-0ubuntu1.19 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.15 deb +libsystemd0 249.11-0ubuntu3.16 deb libtasn1-6 4.18.0-4ubuntu0.1 deb libtinfo6 6.3-2ubuntu0.1 deb libtirpc-common 1.3.2-2ubuntu0.1 deb libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.15 deb +libudev1 249.11-0ubuntu3.16 deb libunistring2 1.0-1 deb libuuid1 2.37.2-4ubuntu3.4 deb libxxhash0 0.8.1-1 deb From b3b8e87f78e10688ceff5d45ffa59643af9440b1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 24 Jun 2025 23:34:37 +0000 Subject: [PATCH 66/72] Bot Updating Package Versions --- package_versions.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index 41b0cc44..f40375f7 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -84,10 +84,10 @@ libnpth0 1.6-3build2 deb libnsl2 1.3.0-2build2 deb libonig5 6.9.7.1-2build1 deb libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.5 deb -libpam-modules-bin 1.4.0-11ubuntu2.5 deb -libpam-runtime 1.4.0-11ubuntu2.5 deb -libpam0g 1.4.0-11ubuntu2.5 deb +libpam-modules 1.4.0-11ubuntu2.6 deb +libpam-modules-bin 1.4.0-11ubuntu2.6 deb +libpam-runtime 1.4.0-11ubuntu2.6 deb +libpam0g 1.4.0-11ubuntu2.6 deb libpcre2-8-0 10.39-3ubuntu0.1 deb libpcre3 2:8.39-13ubuntu0.22.04.1 deb libprocps8 2:3.3.17-6ubuntu2.1 deb From 53312f9aa0c751954e983c72e7972942b0de86bf Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Jul 2025 23:33:18 +0000 Subject: [PATCH 67/72] Bot Updating Templated Files --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 18d614fe..564f20c0 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -94,7 +94,11 @@ pipeline { env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' env.PULL_REQUEST = env.CHANGE_ID env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml' + if ( env.SYFT_IMAGE_TAG == null ) { + env.SYFT_IMAGE_TAG = 'latest' + } } + echo "Using syft image tag ${SYFT_IMAGE_TAG}" sh '''#! /bin/bash echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' script{ @@ -712,7 +716,7 @@ pipeline { docker run --rm \ -v /var/run/docker.sock:/var/run/docker.sock:ro \ -v ${TEMPDIR}:/tmp \ - ghcr.io/anchore/syft:v1.26.1 \ + ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \ ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" @@ -822,6 +826,7 @@ pipeline { -e WEB_AUTH=\"${CI_AUTH}\" \ -e WEB_PATH=\"${CI_WEBPATH}\" \ -e NODE_NAME=\"${NODE_NAME}\" \ + -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ -t ghcr.io/linuxserver/ci:latest \ python3 test_build.py''' } From 8bc194e16c90158e546f70f5c0526f99c0bc2425 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Jul 2025 23:35:02 +0000 Subject: [PATCH 68/72] Bot Updating Templated Files --- .github/workflows/call_issue_pr_tracker.yml | 3 +++ .github/workflows/call_issues_cron.yml | 3 +++ .github/workflows/external_trigger.yml | 3 +++ .github/workflows/external_trigger_scheduler.yml | 3 +++ .github/workflows/greetings.yml | 6 ++++++ .github/workflows/package_trigger_scheduler.yml | 3 +++ 6 files changed, 21 insertions(+) diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml index 2c307843..d07cf121 100755 --- a/.github/workflows/call_issue_pr_tracker.yml +++ b/.github/workflows/call_issue_pr_tracker.yml @@ -8,6 +8,9 @@ on: pull_request_review: types: [submitted,edited,dismissed] +permissions: + contents: read + jobs: manage-project: permissions: diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml index b1b223cc..227f1d3b 100755 --- a/.github/workflows/call_issues_cron.yml +++ b/.github/workflows/call_issues_cron.yml @@ -4,6 +4,9 @@ on: - cron: '13 7 * * *' workflow_dispatch: +permissions: + contents: read + jobs: stale: permissions: diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index c6cfa8ef..125c04ea 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -3,6 +3,9 @@ name: External Trigger Main on: workflow_dispatch: +permissions: + contents: read + jobs: external-trigger-jammy: runs-on: ubuntu-latest diff --git a/.github/workflows/external_trigger_scheduler.yml b/.github/workflows/external_trigger_scheduler.yml index d550b4e5..0b0d144a 100644 --- a/.github/workflows/external_trigger_scheduler.yml +++ b/.github/workflows/external_trigger_scheduler.yml @@ -5,6 +5,9 @@ on: - cron: '18 * * * *' workflow_dispatch: +permissions: + contents: read + jobs: external-trigger-scheduler: runs-on: ubuntu-latest diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 1c097560..e19ddc16 100755 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -2,8 +2,14 @@ name: Greetings on: [pull_request_target, issues] +permissions: + contents: read + jobs: greeting: + permissions: + issues: write + pull-requests: write runs-on: ubuntu-latest steps: - uses: actions/first-interaction@v1 diff --git a/.github/workflows/package_trigger_scheduler.yml b/.github/workflows/package_trigger_scheduler.yml index 6a52f387..0760c39f 100644 --- a/.github/workflows/package_trigger_scheduler.yml +++ b/.github/workflows/package_trigger_scheduler.yml @@ -5,6 +5,9 @@ on: - cron: '19 23 * * 2' workflow_dispatch: +permissions: + contents: read + jobs: package-trigger-scheduler: runs-on: ubuntu-latest From 8e408e1e59407fb5e1b8eaf4696e288dea4ed8b4 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 8 Jul 2025 23:38:40 +0000 Subject: [PATCH 69/72] Bot Updating Package Versions --- package_versions.txt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/package_versions.txt b/package_versions.txt index f40375f7..6da5e46d 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -15,21 +15,21 @@ dash 0.5.11+git20210903+057cd650a4ed-3build1 deb debconf 1.5.79ubuntu1 deb debianutils 5.5-1ubuntu2 deb diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.3 deb +dirmngr 2.2.27-3ubuntu2.4 deb dpkg 1.21.1ubuntu2.3 deb e2fsprogs 1.46.5-2ubuntu1.2 deb findutils 4.8.0-1ubuntu3 deb gcc-12-base 12.3.0-1ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.3 deb -gnupg-l10n 2.2.27-3ubuntu2.3 deb -gnupg-utils 2.2.27-3ubuntu2.3 deb -gpg 2.2.27-3ubuntu2.3 deb -gpg-agent 2.2.27-3ubuntu2.3 deb -gpg-wks-client 2.2.27-3ubuntu2.3 deb -gpg-wks-server 2.2.27-3ubuntu2.3 deb -gpgconf 2.2.27-3ubuntu2.3 deb -gpgsm 2.2.27-3ubuntu2.3 deb -gpgv 2.2.27-3ubuntu2.3 deb +gnupg 2.2.27-3ubuntu2.4 deb +gnupg-l10n 2.2.27-3ubuntu2.4 deb +gnupg-utils 2.2.27-3ubuntu2.4 deb +gpg 2.2.27-3ubuntu2.4 deb +gpg-agent 2.2.27-3ubuntu2.4 deb +gpg-wks-client 2.2.27-3ubuntu2.4 deb +gpg-wks-server 2.2.27-3ubuntu2.4 deb +gpgconf 2.2.27-3ubuntu2.4 deb +gpgsm 2.2.27-3ubuntu2.4 deb +gpgv 2.2.27-3ubuntu2.4 deb grep 3.7-1build1 deb gzip 1.10-4ubuntu4.1 deb hostname 3.23ubuntu2 deb @@ -105,7 +105,7 @@ libsepol2 3.3-1build1 deb libsmartcols1 2.37.2-4ubuntu3.4 deb libsqlite3-0 3.37.2-2ubuntu0.4 deb libss2 1.46.5-2ubuntu1.2 deb -libssh-4 0.9.6-2ubuntu0.22.04.3 deb +libssh-4 0.9.6-2ubuntu0.22.04.4 deb libssl3 3.0.2-0ubuntu1.19 deb libstdc++6 12.3.0-1ubuntu1~22.04 deb libsystemd0 249.11-0ubuntu3.16 deb From 5b7a623d31d3dbb0ccb34b49c58b1cd59c2defd1 Mon Sep 17 00:00:00 2001 From: LinuxServer-CI Date: Tue, 15 Jul 2025 23:35:00 +0000 Subject: [PATCH 70/72] Bot Updating Package Versions --- package_versions.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_versions.txt b/package_versions.txt index 6da5e46d..08ecaa74 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -59,7 +59,7 @@ libffi8 3.4.2-4 deb libgcc-s1 12.3.0-1ubuntu1~22.04 deb libgcrypt20 1.9.4-3ubuntu3 deb libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.6 deb +libgnutls30 3.7.3-4ubuntu1.7 deb libgpg-error0 1.43-3 deb libgssapi-krb5-2 1.19.2-2ubuntu0.7 deb libhogweed6 3.7.3-1build2 deb From 8ebf7f8a42d8f58b67f17f1f628858d2346f4423 Mon Sep 17 00:00:00 2001 From: Gabe Mendoza <6244640+thatguyinabeanie@users.noreply.github.com> Date: Fri, 25 Jul 2025 12:06:50 -0500 Subject: [PATCH 71/72] [CIVIS-11019] ubuntu 22.04 fips enabled base image for linuxserver (#1) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * PR template * remove jenkins things * remove source list files * remove extra files * remove extra files * Refactor Dockerfile to use FIPS-compliant base image - Replace multi-stage build with gabemendoza1/cloudcode-baseimage-ubuntu-fips:jammy-22.04 - Remove Ubuntu Cloud Image extraction and Alpine stage - Remove sources.list copy (already configured in base image) - Add s6-overlay installation for LinuxServer.io compatibility - Add LinuxServer.io mod scripts (docker-mods, package-install, lsiown) - Conditionally create abc user (911:911) if not exists - Maintain full LinuxServer.io ecosystem on FIPS foundation 🤖 Generated with [opencode](https://opencode.ai) Co-Authored-By: opencode * cleanup docker compose * reduce * python * save * save * optmized installs * remove more workflows * remove Python dependencies from Ubuntu FIPS base image 🤖 Generated with [opencode](https://opencode.ai) Co-Authored-By: opencode * build in codebuild * fixed buildspec * update merge_master.yaml and release.yaml * docker build kit * remove echos * set ecr image tag name and related things * update buildspec defs * base image name * remove extra compose args * simplify buildspecs * styling * remove .env.example * move build policy up * save * /config * /root * simplify Dockerfile * update placeholders * latest * fixed buildspec yamls * disable chowning of /config * fix pr template --------- Co-authored-by: opencode --- .github/PULL_REQUEST_TEMPLATE.md | 51 +- .github/workflows/call_issue_pr_tracker.yml | 19 - .github/workflows/call_issues_cron.yml | 16 - .github/workflows/greetings.yml | 19 - .gitignore | 1 + Dockerfile | 69 +- Dockerfile.aarch64 | 150 --- Jenkinsfile | 1142 ------------------ buildspec/merge_master.yaml | 21 + buildspec/push.yaml | 25 + buildspec/release.yaml | 28 + docker-compose.yml | 22 + jenkins-vars.yml | 26 - package_versions.txt | 146 --- readme-vars.yml | 27 - root/etc/s6-overlay/s6-rc.d/init-adduser/run | 2 +- sources.list | 12 - sources.list.arm | 12 - 18 files changed, 155 insertions(+), 1633 deletions(-) delete mode 100755 .github/workflows/call_issue_pr_tracker.yml delete mode 100755 .github/workflows/call_issues_cron.yml delete mode 100755 .github/workflows/greetings.yml delete mode 100644 Dockerfile.aarch64 delete mode 100755 Jenkinsfile create mode 100644 buildspec/merge_master.yaml create mode 100644 buildspec/push.yaml create mode 100644 buildspec/release.yaml create mode 100644 docker-compose.yml delete mode 100644 jenkins-vars.yml delete mode 100755 package_versions.txt delete mode 100644 readme-vars.yml delete mode 100644 sources.list delete mode 100644 sources.list.arm diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 0b4431d4..f78f95a0 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,43 +1,38 @@ - +## Description -[linuxserverurl]: https://linuxserver.io -[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl] +Required: Please provide a brief description of what this pull request is trying to accomplish. +> - +## Context, Consequences, & Considerations - - - - - +Required: Please step through the following list, pausing at each item to consider your change in relation to the item's context. +Check the box to mark that it applies, and enter your relevant notes under the item. +- [ ] Security: This has security implications. This includes (but not limited to) adding users, modifying user/app permissions, network rules/policies, changing a system interconnection, or changing an authorization strategy. + - [ ] This PR does not require security review. These changes are part of a project plan that has already undergone security review. The link is provided below. + - [ ] This PR requires security review. Add the `security` label to this PR then request a review from the [Security Code Reviewers Team](https://github.com/orgs/civisanalytics/teams/security-code-reviewers). - - - - - +> ------------------------------- +- [ ] Execution: This change requires commands to be run outside of the normal merge. - - [ ] I have read the [contributing](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/jammy/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications +> ------------------------------- +- [ ] Impact: This change may cause service interruptions. - +> -## Description: - +- [ ] Testing: How did you test this change (unit tests, acceptance tests, etc.)? Did you do any manual testing? -## Benefits of this PR and context: - +> -## How Has This Been Tested? - - - +- [ ] Testing: How will you confirm this change once it's merged? +> -## Source / References: - +- [ ] Documentation: Documentation to reflect this change has been added to Confluence or Zendesk. + +> + +- [ ] **All items of the checklist have been considered and this PR description is complete.** diff --git a/.github/workflows/call_issue_pr_tracker.yml b/.github/workflows/call_issue_pr_tracker.yml deleted file mode 100755 index d07cf121..00000000 --- a/.github/workflows/call_issue_pr_tracker.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Issue & PR Tracker - -on: - issues: - types: [opened,reopened,labeled,unlabeled,closed] - pull_request_target: - types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed] - pull_request_review: - types: [submitted,edited,dismissed] - -permissions: - contents: read - -jobs: - manage-project: - permissions: - issues: write - uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1 - secrets: inherit diff --git a/.github/workflows/call_issues_cron.yml b/.github/workflows/call_issues_cron.yml deleted file mode 100755 index 227f1d3b..00000000 --- a/.github/workflows/call_issues_cron.yml +++ /dev/null @@ -1,16 +0,0 @@ -name: Mark stale issues and pull requests -on: - schedule: - - cron: '13 7 * * *' - workflow_dispatch: - -permissions: - contents: read - -jobs: - stale: - permissions: - issues: write - pull-requests: write - uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1 - secrets: inherit diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml deleted file mode 100755 index e19ddc16..00000000 --- a/.github/workflows/greetings.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: Greetings - -on: [pull_request_target, issues] - -permissions: - contents: read - -jobs: - greeting: - permissions: - issues: write - pull-requests: write - runs-on: ubuntu-latest - steps: - - uses: actions/first-interaction@v1 - with: - issue-message: 'Thanks for opening your first issue here! Be sure to follow the relevant issue templates, or risk having this issue marked as invalid.' - pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/jammy/.github/PULL_REQUEST_TEMPLATE.md)!' - repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 6e8ad977..5df90450 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ Network Trash Folder Temporary Items .apdisk .jenkins-external +.env diff --git a/Dockerfile b/Dockerfile index dcd3bb20..e4d4807e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,57 +1,58 @@ # syntax=docker/dockerfile:1 -FROM alpine:3 as rootfs-stage +# ECR and base image configuration - extracted from CodeBuild environment +ARG ECR_ACCOUNT_ID +ARG ECR_REGION=us-east-1 +ARG BASE_IMAGE_NAME=civis-ubuntu-fips +ARG BASE_IMAGE_TAG=22.04 +ARG ECR_URI=${ECR_ACCOUNT_ID}.dkr.ecr-fips.${ECR_REGION}.amazonaws.com/${BASE_IMAGE_NAME}:${BASE_IMAGE_TAG} + +FROM ${ECR_URI} as ubuntu-fips-s6 -# environment ENV REL=jammy ENV ARCH=amd64 -# install packages -RUN \ - apk add --no-cache \ - bash \ - curl \ - tzdata \ - xz - -# grab base tarball -RUN \ - mkdir /root-out && \ - curl -o \ - /rootfs.tar.gz -L \ - https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ - tar xf \ - /rootfs.tar.gz -C \ - /root-out && \ - rm -rf \ - /root-out/var/log/* - -# set version for s6 overlay ARG S6_OVERLAY_VERSION="3.1.6.2" ARG S6_OVERLAY_ARCH="x86_64" +# Install base development tools (no Python) +RUN apt-get update && apt-get install -y \ + curl \ + tzdata \ + build-essential \ + libpq-dev \ + git \ + ca-certificates \ + openssl \ + xz-utils \ + libssl-dev && \ + # Clean up + rm -rf /var/lib/apt/lists/* && \ + # Update CA certificates to ensure SSL/TLS works properly + update-ca-certificates + # add s6 overlay ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz +RUN tar -C / -Jxpf /tmp/s6-overlay-noarch.tar.xz ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz +RUN tar -C / -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz # add s6 optional symlinks ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz +RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz +RUN tar -C / -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz + +FROM ubuntu-fips-s6 as linuxserver-base -# Runtime stage -FROM scratch -COPY --from=rootfs-stage /root-out/ / ARG BUILD_DATE ARG VERSION ARG MODS_VERSION="v3" ARG PKG_INST_VERSION="v1" ARG LSIOWN_VERSION="v1" + LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="TheLamer" +LABEL maintainer="civisanalytics" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" @@ -69,9 +70,6 @@ ENV HOME="/root" \ VIRTUAL_ENV=/lsiopy \ PATH="/lsiopy/bin:$PATH" -# copy sources -COPY sources.list /etc/apt/ - RUN \ echo "**** Ripped from Ubuntu Docker Logic ****" && \ set -xe && \ @@ -129,7 +127,8 @@ RUN \ /app \ /config \ /defaults \ - /lsiopy && \ + /lsiopy \ + /workspace && \ echo "**** cleanup ****" && \ apt-get autoremove && \ apt-get clean && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 deleted file mode 100644 index 62b08adb..00000000 --- a/Dockerfile.aarch64 +++ /dev/null @@ -1,150 +0,0 @@ -# syntax=docker/dockerfile:1 - -FROM alpine:3 as rootfs-stage - -# environment -ENV REL=jammy -ENV ARCH=arm64 - -# install packages -RUN \ - apk add --no-cache \ - bash \ - curl \ - tzdata \ - xz - -# grab base tarball -RUN \ - mkdir /root-out && \ - curl -o \ - /rootfs.tar.gz -L \ - https://partner-images.canonical.com/core/${REL}/current/ubuntu-${REL}-core-cloudimg-${ARCH}-root.tar.gz && \ - tar xf \ - /rootfs.tar.gz -C \ - /root-out && \ - rm -rf \ - /root-out/var/log/* - -# set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.1.6.2" -ARG S6_OVERLAY_ARCH="aarch64" - -# add s6 overlay -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-noarch.tar.xz -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.xz - -# add s6 optional symlinks -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-noarch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-noarch.tar.xz -ADD https://github.com/just-containers/s6-overlay/releases/download/v${S6_OVERLAY_VERSION}/s6-overlay-symlinks-arch.tar.xz /tmp -RUN tar -C /root-out -Jxpf /tmp/s6-overlay-symlinks-arch.tar.xz - -# Runtime stage -FROM scratch -COPY --from=rootfs-stage /root-out/ / -ARG BUILD_DATE -ARG VERSION -ARG MODS_VERSION="v3" -ARG PKG_INST_VERSION="v1" -ARG LSIOWN_VERSION="v1" -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="TheLamer" - -ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" -ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/package-install.${PKG_INST_VERSION}" "/etc/s6-overlay/s6-rc.d/init-mods-package-install/run" -ADD --chmod=744 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" - -# set environment variables -ARG DEBIAN_FRONTEND="noninteractive" -ENV HOME="/root" \ - LANGUAGE="en_US.UTF-8" \ - LANG="en_US.UTF-8" \ - TERM="xterm" \ - S6_CMD_WAIT_FOR_SERVICES_MAXTIME="0" \ - S6_VERBOSITY=1 \ - S6_STAGE2_HOOK=/docker-mods \ - VIRTUAL_ENV=/lsiopy \ - PATH="/lsiopy/bin:$PATH" - -# copy sources -COPY sources.list.arm /etc/apt/sources.list - -RUN \ - echo "**** Ripped from Ubuntu Docker Logic ****" && \ - set -xe && \ - echo '#!/bin/sh' \ - > /usr/sbin/policy-rc.d && \ - echo 'exit 101' \ - >> /usr/sbin/policy-rc.d && \ - chmod +x \ - /usr/sbin/policy-rc.d && \ - dpkg-divert --local --rename --add /sbin/initctl && \ - cp -a \ - /usr/sbin/policy-rc.d \ - /sbin/initctl && \ - sed -i \ - 's/^exit.*/exit 0/' \ - /sbin/initctl && \ - echo 'force-unsafe-io' \ - > /etc/dpkg/dpkg.cfg.d/docker-apt-speedup && \ - echo 'DPkg::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \ - > /etc/apt/apt.conf.d/docker-clean && \ - echo 'APT::Update::Post-Invoke { "rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true"; };' \ - >> /etc/apt/apt.conf.d/docker-clean && \ - echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";' \ - >> /etc/apt/apt.conf.d/docker-clean && \ - echo 'Acquire::Languages "none";' \ - > /etc/apt/apt.conf.d/docker-no-languages && \ - echo 'Acquire::GzipIndexes "true"; Acquire::CompressionTypes::Order:: "gz";' \ - > /etc/apt/apt.conf.d/docker-gzip-indexes && \ - echo 'Apt::AutoRemove::SuggestsImportant "false";' \ - > /etc/apt/apt.conf.d/docker-autoremove-suggests && \ - mkdir -p /run/systemd && \ - echo 'docker' \ - > /run/systemd/container && \ - echo "**** install apt-utils and locales ****" && \ - apt-get update && \ - apt-get upgrade -y && \ - apt-get install -y \ - apt-utils \ - locales && \ - echo "**** install packages ****" && \ - apt-get install -y \ - catatonit \ - cron \ - curl \ - gnupg \ - jq \ - netcat \ - tzdata && \ - echo "**** generate locale ****" && \ - locale-gen en_US.UTF-8 && \ - echo "**** create abc user and make our folders ****" && \ - useradd -u 911 -U -d /config -s /bin/false abc && \ - usermod -G users abc && \ - mkdir -p \ - /app \ - /config \ - /defaults \ - /lsiopy && \ - echo "**** add qemu ****" && \ - curl -o \ - /usr/bin/qemu-aarch64-static -L \ - "https://lsio-ci.ams3.digitaloceanspaces.com/qemu-aarch64-static" && \ - chmod +x /usr/bin/qemu-aarch64-static && \ - echo "**** cleanup ****" && \ - apt-get autoremove && \ - apt-get clean && \ - rm -rf \ - /tmp/* \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /var/log/* - -# add local files -COPY root/ / - -ENTRYPOINT ["/init"] diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100755 index 564f20c0..00000000 --- a/Jenkinsfile +++ /dev/null @@ -1,1142 +0,0 @@ -pipeline { - agent { - label 'X86-64-MULTI' - } - options { - buildDiscarder(logRotator(numToKeepStr: '10', daysToKeepStr: '60')) - parallelsAlwaysFailFast() - } - // Input to determine if this is a package check - parameters { - string(defaultValue: 'false', description: 'package check run', name: 'PACKAGE_CHECK') - } - // Configuration for the variables used for this specific repo - environment { - BUILDS_DISCORD=credentials('build_webhook_url') - GITHUB_TOKEN=credentials('498b4638-2d02-4ce5-832d-8a57d01d97ab') - GITLAB_TOKEN=credentials('b6f0f1dd-6952-4cf6-95d1-9c06380283f0') - GITLAB_NAMESPACE=credentials('gitlab-namespace-id') - DOCKERHUB_TOKEN=credentials('docker-hub-ci-pat') - QUAYIO_API_TOKEN=credentials('quayio-repo-api-token') - GIT_SIGNING_KEY=credentials('484fbca6-9a4f-455e-b9e3-97ac98785f5f') - BUILD_VERSION_ARG = 'OS' - LS_USER = 'linuxserver' - LS_REPO = 'docker-baseimage-ubuntu' - CONTAINER_NAME = 'baseimage-ubuntu' - DOCKERHUB_IMAGE = 'lsiobase/ubuntu' - DEV_DOCKERHUB_IMAGE = 'lsiodev/ubuntu' - PR_DOCKERHUB_IMAGE = 'lspipepr/ubuntu' - DIST_IMAGE = 'ubuntu' - MULTIARCH='true' - CI='true' - CI_WEB='false' - CI_PORT='80' - CI_SSL='true' - CI_DELAY='30' - CI_DOCKERENV='LSIO_FIRST_PARTY=true' - CI_AUTH='' - CI_WEBPATH='' - } - stages { - stage("Set git config"){ - steps{ - sh '''#!/bin/bash - cat ${GIT_SIGNING_KEY} > /config/.ssh/id_sign - chmod 600 /config/.ssh/id_sign - ssh-keygen -y -f /config/.ssh/id_sign > /config/.ssh/id_sign.pub - echo "Using $(ssh-keygen -lf /config/.ssh/id_sign) to sign commits" - git config --global gpg.format ssh - git config --global user.signingkey /config/.ssh/id_sign - git config --global commit.gpgsign true - ''' - } - } - // Setup all the basic environment variables needed for the build - stage("Set ENV Variables base"){ - steps{ - echo "Running on node: ${NODE_NAME}" - sh '''#! /bin/bash - echo "Pruning builder" - docker builder prune -f --builder container || : - containers=$(docker ps -q) - if [[ -n "${containers}" ]]; then - BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') - for container in ${containers}; do - if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then - echo "skipping buildx container in docker stop" - else - echo "Stopping container ${container}" - docker stop ${container} - fi - done - fi - docker system prune -f --volumes || : - docker image prune -af || : - ''' - script{ - env.EXIT_STATUS = '' - env.LS_RELEASE = sh( - script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:jammy 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', - returnStdout: true).trim() - env.LS_RELEASE_NOTES = sh( - script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''', - returnStdout: true).trim() - env.GITHUB_DATE = sh( - script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', - returnStdout: true).trim() - env.COMMIT_SHA = sh( - script: '''git rev-parse HEAD''', - returnStdout: true).trim() - env.GH_DEFAULT_BRANCH = sh( - script: '''git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||' ''', - returnStdout: true).trim() - env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/commit/' + env.GIT_COMMIT - env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DOCKERHUB_IMAGE + '/tags/' - env.PULL_REQUEST = env.CHANGE_ID - env.TEMPLATED_FILES = 'Jenkinsfile README.md LICENSE .editorconfig ./.github/CONTRIBUTING.md ./.github/FUNDING.yml ./.github/ISSUE_TEMPLATE/config.yml ./.github/ISSUE_TEMPLATE/issue.bug.yml ./.github/ISSUE_TEMPLATE/issue.feature.yml ./.github/PULL_REQUEST_TEMPLATE.md ./.github/workflows/external_trigger_scheduler.yml ./.github/workflows/greetings.yml ./.github/workflows/package_trigger_scheduler.yml ./.github/workflows/call_issue_pr_tracker.yml ./.github/workflows/call_issues_cron.yml ./.github/workflows/permissions.yml ./.github/workflows/external_trigger.yml' - if ( env.SYFT_IMAGE_TAG == null ) { - env.SYFT_IMAGE_TAG = 'latest' - } - } - echo "Using syft image tag ${SYFT_IMAGE_TAG}" - sh '''#! /bin/bash - echo "The default github branch detected as ${GH_DEFAULT_BRANCH}" ''' - script{ - env.LS_RELEASE_NUMBER = sh( - script: '''echo ${LS_RELEASE} |sed 's/^.*-ls//g' ''', - returnStdout: true).trim() - } - script{ - env.LS_TAG_NUMBER = sh( - script: '''#! /bin/bash - tagsha=$(git rev-list -n 1 jammy-${LS_RELEASE} 2>/dev/null) - if [ "${tagsha}" == "${COMMIT_SHA}" ]; then - echo ${LS_RELEASE_NUMBER} - elif [ -z "${GIT_COMMIT}" ]; then - echo ${LS_RELEASE_NUMBER} - else - echo $((${LS_RELEASE_NUMBER} + 1)) - fi''', - returnStdout: true).trim() - } - } - } - /* ####################### - Package Version Tagging - ####################### */ - // Grab the current package versions in Git to determine package tag - stage("Set Package tag"){ - steps{ - script{ - env.PACKAGE_TAG = sh( - script: '''#!/bin/bash - if [ -e package_versions.txt ] ; then - cat package_versions.txt | md5sum | cut -c1-8 - else - echo none - fi''', - returnStdout: true).trim() - } - } - } - /* ######################## - External Release Tagging - ######################## */ - // If this is an os release set release type to none to indicate no external release - stage("Set ENV os"){ - steps{ - script{ - env.EXT_RELEASE = env.PACKAGE_TAG - env.RELEASE_LINK = 'none' - } - } - } - // Sanitize the release tag and strip illegal docker or github characters - stage("Sanitize tag"){ - steps{ - script{ - env.EXT_RELEASE_CLEAN = sh( - script: '''echo ${EXT_RELEASE} | sed 's/[~,%@+;:/ ]//g' ''', - returnStdout: true).trim() - - def semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)\.(\d+)/ - if (semver.find()) { - env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" - } else { - semver = env.EXT_RELEASE_CLEAN =~ /(\d+)\.(\d+)(?:\.(\d+))?(.*)/ - if (semver.find()) { - if (semver[0][3]) { - env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${semver[0][3]}" - } else if (!semver[0][3] && !semver[0][4]) { - env.SEMVER = "${semver[0][1]}.${semver[0][2]}.${(new Date()).format('YYYYMMdd')}" - } - } - } - - if (env.SEMVER != null) { - if (BRANCH_NAME != "${env.GH_DEFAULT_BRANCH}") { - env.SEMVER = "${env.SEMVER}-${BRANCH_NAME}" - } - println("SEMVER: ${env.SEMVER}") - } else { - println("No SEMVER detected") - } - - } - } - } - // If this is a jammy build use live docker endpoints - stage("Set ENV live build"){ - when { - branch "jammy" - environment name: 'CHANGE_ID', value: '' - } - steps { - script{ - env.IMAGE = env.DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/' + env.CONTAINER_NAME - env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME - env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME - if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-jammy-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-jammy-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - } else { - env.CI_TAGS = 'jammy-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - } - env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - env.META_TAG = 'jammy-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - env.EXT_RELEASE_TAG = 'jammy-version-' + env.EXT_RELEASE_CLEAN - env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' - } - } - } - // If this is a dev build use dev docker endpoints - stage("Set ENV dev build"){ - when { - not {branch "jammy"} - environment name: 'CHANGE_ID', value: '' - } - steps { - script{ - env.IMAGE = env.DEV_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lsiodev-' + env.CONTAINER_NAME - env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME - env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME - if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-jammy-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-jammy-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - } else { - env.CI_TAGS = 'jammy-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - } - env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - env.META_TAG = 'jammy-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - env.EXT_RELEASE_TAG = 'jammy-version-' + env.EXT_RELEASE_CLEAN - env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/' - env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' - } - } - } - // If this is a pull request build use dev docker endpoints - stage("Set ENV PR build"){ - when { - not {environment name: 'CHANGE_ID', value: ''} - } - steps { - script{ - env.IMAGE = env.PR_DOCKERHUB_IMAGE - env.GITHUBIMAGE = 'ghcr.io/' + env.LS_USER + '/lspipepr-' + env.CONTAINER_NAME - 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-jammy-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-jammy-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST - } else { - env.CI_TAGS = 'jammy-' + 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 + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST - env.META_TAG = 'jammy-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST - env.EXT_RELEASE_TAG = 'jammy-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/' - env.BUILDCACHE = 'docker.io/lsiodev/buildcache,registry.gitlab.com/linuxserver.io/docker-jenkins-builder/lsiodev-buildcache,ghcr.io/linuxserver/lsiodev-buildcache,quay.io/linuxserver.io/lsiodev-buildcache' - } - } - } - // Run ShellCheck - stage('ShellCheck') { - when { - environment name: 'CI', value: 'true' - } - steps { - withCredentials([ - string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), - string(credentialsId: 'ci-tests-s3-secret-access-key', variable: 'S3_SECRET') - ]) { - script{ - env.SHELLCHECK_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/shellcheck-result.xml' - } - sh '''curl -sL https://raw.githubusercontent.com/linuxserver/docker-jenkins-builder/master/checkrun.sh | /bin/bash''' - sh '''#! /bin/bash - docker run --rm \ - -v ${WORKSPACE}:/mnt \ - -e AWS_ACCESS_KEY_ID=\"${S3_KEY}\" \ - -e AWS_SECRET_ACCESS_KEY=\"${S3_SECRET}\" \ - 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 && \ - pip install --no-cache-dir s3cmd && \ - s3cmd put --no-preserve --acl-public -m text/xml /mnt/shellcheck-result.xml s3://ci-tests.linuxserver.io/${IMAGE}/${META_TAG}/shellcheck-result.xml" || :''' - } - } - } - // Use helper containers to render templated files - stage('Update-Templates') { - when { - branch "jammy" - environment name: 'CHANGE_ID', value: '' - expression { - env.CONTAINER_NAME != null - } - } - steps { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - docker pull ghcr.io/linuxserver/jenkins-builder:latest - # Cloned repo paths for templating: - # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch jammy of ${LS_USER}/${LS_REPO} for running the jenkins builder on - # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch jammy of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github - # ${TEMPDIR}/docs/docker-documentation: Cloned docs repo for pushing docs updates to Github - # ${TEMPDIR}/unraid/docker-templates: Cloned docker-templates repo to check for logos - # ${TEMPDIR}/unraid/templates: Cloned templates repo for commiting unraid template changes and pushing back to Github - git clone --branch jammy --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} - docker run --rm -v ${TEMPDIR}/docker-${CONTAINER_NAME}:/tmp -e LOCAL=true -e PUID=$(id -u) -e PGID=$(id -g) ghcr.io/linuxserver/jenkins-builder:latest - echo "Starting Stage 1 - Jenkinsfile update" - if [[ "$(md5sum Jenkinsfile | awk '{ print $1 }')" != "$(md5sum ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile | awk '{ print $1 }')" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f jammy - cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ - git add Jenkinsfile - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "Jenkinsfile is up to date." - fi - echo "Starting Stage 2 - Delete old templates" - OLD_TEMPLATES=".github/ISSUE_TEMPLATE.md .github/ISSUE_TEMPLATE/issue.bug.md .github/ISSUE_TEMPLATE/issue.feature.md .github/workflows/call_invalid_helper.yml .github/workflows/stale.yml .github/workflows/package_trigger.yml" - for i in ${OLD_TEMPLATES}; do - if [[ -f "${i}" ]]; then - TEMPLATES_TO_DELETE="${i} ${TEMPLATES_TO_DELETE}" - fi - done - if [[ -n "${TEMPLATES_TO_DELETE}" ]]; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f jammy - for i in ${TEMPLATES_TO_DELETE}; do - git rm "${i}" - done - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Deleting old/deprecated templates and exiting build, new one will trigger based on commit" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "No templates to delete" - fi - echo "Starting Stage 3 - Update templates" - CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8) - if [[ "${CURRENTHASH}" != "${NEWHASH}" ]] || ! grep -q '.jenkins-external' "${WORKSPACE}/.gitignore" 2>/dev/null; then - mkdir -p ${TEMPDIR}/repo - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - cd ${TEMPDIR}/repo/${LS_REPO} - git checkout -f jammy - cd ${TEMPDIR}/docker-${CONTAINER_NAME} - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows - mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE - cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/ || : - cp --parents readme-vars.yml ${TEMPDIR}/repo/${LS_REPO}/ || : - cd ${TEMPDIR}/repo/${LS_REPO}/ - if ! grep -q '.jenkins-external' .gitignore 2>/dev/null; then - echo ".jenkins-external" >> .gitignore - git add .gitignore - fi - git add readme-vars.yml ${TEMPLATED_FILES} - git commit -m 'Bot Updating Templated Files' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy - echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "Updating templates and exiting build, new one will trigger based on commit" - rm -Rf ${TEMPDIR} - exit 0 - else - echo "false" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} - echo "No templates to update" - fi - echo "Starting Stage 4 - External repo updates: Docs, Unraid Template and Readme Sync to Docker Hub" - mkdir -p ${TEMPDIR}/docs - 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 - GH_DOCS_DEFAULT_BRANCH=$(git remote show origin | grep "HEAD branch:" | sed 's|.*HEAD branch: ||') - git add docs/images/docker-${CONTAINER_NAME}.md - echo "Updating docs repo" - git commit -m 'Bot Updating Documentation' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} || \ - (MAXWAIT="10" && echo "Push to docs failed, trying again in ${MAXWAIT} seconds" && \ - sleep $((RANDOM % MAXWAIT)) && \ - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH} --rebase && \ - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/linuxserver/docker-documentation.git ${GH_DOCS_DEFAULT_BRANCH}) - else - echo "Docs update not needed, skipping" - fi - if [[ "${BRANCH_NAME}" == "${GH_DEFAULT_BRANCH}" ]]; then - if [[ $(cat ${TEMPDIR}/docker-${CONTAINER_NAME}/README.md | wc -m) -gt 25000 ]]; then - echo "Readme is longer than 25,000 characters. Syncing the lite version to Docker Hub" - DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/.jenkins-external/README.lite" - else - echo "Syncing readme to Docker Hub" - DH_README_SYNC_PATH="${TEMPDIR}/docker-${CONTAINER_NAME}/README.md" - fi - if curl -s https://hub.docker.com/v2/namespaces/${DOCKERHUB_IMAGE%%/*}/repositories/${DOCKERHUB_IMAGE##*/}/tags | jq -r '.message' | grep -q 404; then - echo "Docker Hub endpoint doesn't exist. Creating endpoint first." - DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') - curl -s \ - -H "Authorization: JWT ${DH_TOKEN}" \ - -H "Content-Type: application/json" \ - -X POST \ - -d '{"name":"'${DOCKERHUB_IMAGE##*/}'", "namespace":"'${DOCKERHUB_IMAGE%%/*}'"}' \ - https://hub.docker.com/v2/repositories/ || : - fi - DH_TOKEN=$(curl -d '{"username":"linuxserverci", "password":"'${DOCKERHUB_TOKEN}'"}' -H "Content-Type: application/json" -X POST https://hub.docker.com/v2/users/login | jq -r '.token') - curl -s \ - -H "Authorization: JWT ${DH_TOKEN}" \ - -H "Content-Type: application/json" \ - -X PATCH \ - -d "{\\"full_description\\":$(jq -Rsa . ${DH_README_SYNC_PATH})}" \ - https://hub.docker.com/v2/repositories/${DOCKERHUB_IMAGE} || : - else - echo "Not the default Github branch. Skipping readme sync to Docker Hub." - fi - rm -Rf ${TEMPDIR}''' - script{ - env.FILES_UPDATED = sh( - script: '''cat /tmp/${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() - } - } - } - // Exit the build if the Templated files were just updated - stage('Template-exit') { - when { - branch "jammy" - environment name: 'CHANGE_ID', value: '' - environment name: 'FILES_UPDATED', value: 'true' - expression { - env.CONTAINER_NAME != null - } - } - steps { - script{ - env.EXIT_STATUS = 'ABORTED' - } - } - } - // If this is a jammy build check the S6 service file perms - stage("Check S6 Service file Permissions"){ - when { - branch "jammy" - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - script{ - sh '''#! /bin/bash - WRONG_PERM=$(find ./ -path "./.git" -prune -o \\( -name "run" -o -name "finish" -o -name "check" \\) -not -perm -u=x,g=x,o=x -print) - if [[ -n "${WRONG_PERM}" ]]; then - echo "The following S6 service files are missing the executable bit; canceling the faulty build: ${WRONG_PERM}" - exit 1 - else - echo "S6 service file perms look good." - fi ''' - } - } - } - /* ####################### - GitLab Mirroring and Quay.io Repo Visibility - ####################### */ - // Ping into Gitlab to mirror this repo and have a registry endpoint & mark this repo on Quay.io as public - stage("GitLab Mirror and Quay.io Visibility"){ - when { - environment name: 'EXIT_STATUS', value: '' - } - steps{ - sh '''curl -H "Content-Type: application/json" -H "Private-Token: ${GITLAB_TOKEN}" -X POST https://gitlab.com/api/v4/projects \ - -d '{"namespace_id":'${GITLAB_NAMESPACE}',\ - "name":"'${LS_REPO}'", - "mirror":true,\ - "import_url":"https://github.com/linuxserver/'${LS_REPO}'.git",\ - "issues_access_level":"disabled",\ - "merge_requests_access_level":"disabled",\ - "repository_access_level":"enabled",\ - "visibility":"public"}' ''' - sh '''curl -H "Private-Token: ${GITLAB_TOKEN}" -X PUT "https://gitlab.com/api/v4/projects/Linuxserver.io%2F${LS_REPO}" \ - -d "mirror=true&import_url=https://github.com/linuxserver/${LS_REPO}.git" ''' - sh '''curl -H "Content-Type: application/json" -H "Authorization: Bearer ${QUAYIO_API_TOKEN}" -X POST "https://quay.io/api/v1/repository${QUAYIMAGE/quay.io/}/changevisibility" \ - -d '{"visibility":"public"}' ||: ''' - } - } - /* ############### - Build Container - ############### */ - // Build Docker container for push to LS Repo - stage('Build-Single') { - when { - expression { - env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true' - } - environment name: 'EXIT_STATUS', value: '' - } - steps { - echo "Running on node: ${NODE_NAME}" - sh "docker buildx build \ - --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ - --label \"org.opencontainers.image.authors=linuxserver.io\" \ - --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-ubuntu/packages\" \ - --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-ubuntu\" \ - --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-ubuntu\" \ - --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ - --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.vendor=linuxserver.io\" \ - --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ - --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ - --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ - --no-cache --pull -t ${IMAGE}:${META_TAG} --platform=linux/amd64 \ - --provenance=true --sbom=true --builder=container --load \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh '''#! /bin/bash - set -e - IFS=',' read -ra CACHE <<< "$BUILDCACHE" - for i in "${CACHE[@]}"; do - docker tag ${IMAGE}:${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} - done - ''' - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - if [[ "${PACKAGE_CHECK}" != "true" ]]; then - IFS=',' read -ra CACHE <<< "$BUILDCACHE" - for i in "${CACHE[@]}"; do - docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & - done - for p in $(jobs -p); do - wait "$p" || { echo "job $p failed" >&2; exit 1; } - done - fi - ''' - } - } - } - } - // Build MultiArch Docker containers for push to LS Repo - stage('Build-Multi') { - when { - allOf { - environment name: 'MULTIARCH', value: 'true' - expression { params.PACKAGE_CHECK == 'false' } - } - environment name: 'EXIT_STATUS', value: '' - } - parallel { - stage('Build X86') { - steps { - echo "Running on node: ${NODE_NAME}" - sh "docker buildx build \ - --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ - --label \"org.opencontainers.image.authors=linuxserver.io\" \ - --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-ubuntu/packages\" \ - --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-ubuntu\" \ - --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-ubuntu\" \ - --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ - --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.vendor=linuxserver.io\" \ - --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ - --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ - --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ - --no-cache --pull -t ${IMAGE}:amd64-${META_TAG} --platform=linux/amd64 \ - --provenance=true --sbom=true --builder=container --load \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh '''#! /bin/bash - set -e - IFS=',' read -ra CACHE <<< "$BUILDCACHE" - for i in "${CACHE[@]}"; do - docker tag ${IMAGE}:amd64-${META_TAG} ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} - done - ''' - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - if [[ "${PACKAGE_CHECK}" != "true" ]]; then - IFS=',' read -ra CACHE <<< "$BUILDCACHE" - for i in "${CACHE[@]}"; do - docker push ${i}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} & - done - for p in $(jobs -p); do - wait "$p" || { echo "job $p failed" >&2; exit 1; } - done - fi - ''' - } - } - } - } - stage('Build ARM64') { - agent { - label 'ARM64' - } - steps { - echo "Running on node: ${NODE_NAME}" - sh "docker buildx build \ - --label \"org.opencontainers.image.created=${GITHUB_DATE}\" \ - --label \"org.opencontainers.image.authors=linuxserver.io\" \ - --label \"org.opencontainers.image.url=https://github.com/linuxserver/docker-baseimage-ubuntu/packages\" \ - --label \"org.opencontainers.image.documentation=https://docs.linuxserver.io/images/docker-baseimage-ubuntu\" \ - --label \"org.opencontainers.image.source=https://github.com/linuxserver/docker-baseimage-ubuntu\" \ - --label \"org.opencontainers.image.version=${EXT_RELEASE_CLEAN}-ls${LS_TAG_NUMBER}\" \ - --label \"org.opencontainers.image.revision=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.vendor=linuxserver.io\" \ - --label \"org.opencontainers.image.licenses=GPL-3.0-only\" \ - --label \"org.opencontainers.image.ref.name=${COMMIT_SHA}\" \ - --label \"org.opencontainers.image.title=Baseimage-ubuntu\" \ - --label \"org.opencontainers.image.description=baseimage-ubuntu image by linuxserver.io\" \ - --no-cache --pull -f Dockerfile.aarch64 -t ${IMAGE}:arm64v8-${META_TAG} --platform=linux/arm64 \ - --provenance=true --sbom=true --builder=container --load \ - --build-arg ${BUILD_VERSION_ARG}=${EXT_RELEASE} --build-arg VERSION=\"${VERSION_TAG}\" --build-arg BUILD_DATE=${GITHUB_DATE} ." - sh '''#! /bin/bash - set -e - IFS=',' read -ra CACHE <<< "$BUILDCACHE" - for i in "${CACHE[@]}"; do - docker tag ${IMAGE}:arm64v8-${META_TAG} ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - done - ''' - withCredentials([ - [ - $class: 'UsernamePasswordMultiBinding', - credentialsId: 'Quay.io-Robot', - usernameVariable: 'QUAYUSER', - passwordVariable: 'QUAYPASS' - ] - ]) { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - echo $DOCKERHUB_TOKEN | docker login -u linuxserverci --password-stdin - echo $GITHUB_TOKEN | docker login ghcr.io -u LinuxServer-CI --password-stdin - echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin - echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin - if [[ "${PACKAGE_CHECK}" != "true" ]]; then - IFS=',' read -ra CACHE <<< "$BUILDCACHE" - for i in "${CACHE[@]}"; do - docker push ${i}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} & - done - for p in $(jobs -p); do - wait "$p" || { echo "job $p failed" >&2; exit 1; } - done - fi - ''' - } - } - sh '''#! /bin/bash - containers=$(docker ps -aq) - if [[ -n "${containers}" ]]; then - docker stop ${containers} - fi - docker system prune -f --volumes || : - docker image prune -af || : - ''' - } - } - } - } - // Take the image we just built and dump package versions for comparison - stage('Update-packages') { - when { - branch "jammy" - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh '''#! /bin/bash - set -e - TEMPDIR=$(mktemp -d) - if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" != "true" ]; then - LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG} - else - LOCAL_CONTAINER=${IMAGE}:${META_TAG} - fi - touch ${TEMPDIR}/package_versions.txt - docker run --rm \ - -v /var/run/docker.sock:/var/run/docker.sock:ro \ - -v ${TEMPDIR}:/tmp \ - ghcr.io/anchore/syft:${SYFT_IMAGE_TAG} \ - ${LOCAL_CONTAINER} -o table=/tmp/package_versions.txt - NEW_PACKAGE_TAG=$(md5sum ${TEMPDIR}/package_versions.txt | cut -c1-8 ) - echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" - if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then - git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} - git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f jammy - cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ - cd ${TEMPDIR}/${LS_REPO}/ - wait - git add package_versions.txt - git commit -m 'Bot Updating Package Versions' - git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git jammy - echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} - echo "Package tag updated, stopping build process" - else - echo "false" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} - echo "Package tag is same as previous continue with build process" - fi - rm -Rf ${TEMPDIR}''' - script{ - env.PACKAGE_UPDATED = sh( - script: '''cat /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER}''', - returnStdout: true).trim() - } - } - } - // Exit the build if the package file was just updated - stage('PACKAGE-exit') { - when { - branch "jammy" - environment name: 'CHANGE_ID', value: '' - environment name: 'PACKAGE_UPDATED', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - steps { - script{ - env.EXIT_STATUS = 'ABORTED' - } - } - } - // Exit the build if this is just a package check and there are no changes to push - stage('PACKAGECHECK-exit') { - when { - branch "jammy" - environment name: 'CHANGE_ID', value: '' - environment name: 'PACKAGE_UPDATED', value: 'false' - environment name: 'EXIT_STATUS', value: '' - expression { - params.PACKAGE_CHECK == 'true' - } - } - steps { - script{ - env.EXIT_STATUS = 'ABORTED' - } - } - } - /* ####### - Testing - ####### */ - // Run Container tests - stage('Test') { - when { - environment name: 'CI', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - steps { - withCredentials([ - string(credentialsId: 'ci-tests-s3-key-id', variable: 'S3_KEY'), - string(credentialsId: 'ci-tests-s3-secret-access-key ', variable: 'S3_SECRET') - ]) { - script{ - env.CI_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/index.html' - env.CI_JSON_URL = 'https://ci-tests.linuxserver.io/' + env.IMAGE + '/' + env.META_TAG + '/report.json' - } - sh '''#! /bin/bash - set -e - if grep -q 'docker-baseimage' <<< "${LS_REPO}"; then - echo "Detected baseimage, setting LSIO_FIRST_PARTY=true" - if [ -n "${CI_DOCKERENV}" ]; then - CI_DOCKERENV="LSIO_FIRST_PARTY=true|${CI_DOCKERENV}" - else - CI_DOCKERENV="LSIO_FIRST_PARTY=true" - fi - fi - docker pull ghcr.io/linuxserver/ci:latest - if [ "${MULTIARCH}" == "true" ]; then - 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 \ - --shm-size=1gb \ - -v /var/run/docker.sock:/var/run/docker.sock \ - -e IMAGE=\"${IMAGE}\" \ - -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \ - -e TAGS=\"${CI_TAGS}\" \ - -e META_TAG=\"${META_TAG}\" \ - -e RELEASE_TAG=\"jammy\" \ - -e PORT=\"${CI_PORT}\" \ - -e SSL=\"${CI_SSL}\" \ - -e BASE=\"${DIST_IMAGE}\" \ - -e SECRET_KEY=\"${S3_SECRET}\" \ - -e ACCESS_KEY=\"${S3_KEY}\" \ - -e DOCKER_ENV=\"${CI_DOCKERENV}\" \ - -e WEB_SCREENSHOT=\"${CI_WEB}\" \ - -e WEB_AUTH=\"${CI_AUTH}\" \ - -e WEB_PATH=\"${CI_WEBPATH}\" \ - -e NODE_NAME=\"${NODE_NAME}\" \ - -e SYFT_IMAGE_TAG=\"${CI_SYFT_IMAGE_TAG:-${SYFT_IMAGE_TAG}}\" \ - -t ghcr.io/linuxserver/ci:latest \ - python3 test_build.py''' - } - } - } - /* ################## - Release Logic - ################## */ - // If this is an amd64 only image only push a single image - stage('Docker-Push-Single') { - when { - environment name: 'MULTIARCH', value: 'false' - environment name: 'EXIT_STATUS', value: '' - } - steps { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - for PUSHIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - [[ ${PUSHIMAGE%%/*} =~ \\. ]] && PUSHIMAGEPLUS="${PUSHIMAGE}" || PUSHIMAGEPLUS="docker.io/${PUSHIMAGE}" - IFS=',' read -ra CACHE <<< "$BUILDCACHE" - for i in "${CACHE[@]}"; do - if [[ "${PUSHIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then - CACHEIMAGE=${i} - fi - done - docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:jammy -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} - if [ -n "${SEMVER}" ]; then - docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} - fi - done - ''' - } - } - } - // If this is a multi arch release push all images and define the manifest - stage('Docker-Push-Multi') { - when { - environment name: 'MULTIARCH', value: 'true' - environment name: 'EXIT_STATUS', value: '' - } - steps { - retry_backoff(5,5) { - sh '''#! /bin/bash - set -e - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" - IFS=',' read -ra CACHE <<< "$BUILDCACHE" - for i in "${CACHE[@]}"; do - if [[ "${MANIFESTIMAGEPLUS}" == "$(cut -d "/" -f1 <<< ${i})"* ]]; then - CACHEIMAGE=${i} - fi - done - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-jammy -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-jammy -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - if [ -n "${SEMVER}" ]; then - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} - fi - done - for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker buildx imagetools create -t ${MANIFESTIMAGE}:jammy ${MANIFESTIMAGE}:amd64-jammy ${MANIFESTIMAGE}:arm64v8-jammy - docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} - - docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} - if [ -n "${SEMVER}" ]; then - docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} - fi - done - ''' - } - } - } - // If this is a public release tag it in the LS Github - stage('Github-Tag-Push-Release') { - when { - branch "jammy" - expression { - env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - } - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - echo "Pushing New tag for current commit ${META_TAG}" - sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ - -d '{"tag":"'${META_TAG}'",\ - "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to jammy",\ - "type": "commit",\ - "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' - echo "Pushing New release for Tag" - sh '''#! /bin/bash - echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json - echo '{"tag_name":"'${META_TAG}'",\ - "target_commitish": "jammy",\ - "name": "'${META_TAG}'",\ - "body": "**CI Report:**\\n\\n'${CI_URL:-N/A}'\\n\\n**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n\\n**Remote Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": true}' >> releasebody.json - paste -d'\\0' start releasebody.json > releasebody.json.done - curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' - } - } - // Add protection to the release branch - stage('Github-Release-Branch-Protection') { - when { - branch "jammy" - environment name: 'CHANGE_ID', value: '' - environment name: 'EXIT_STATUS', value: '' - } - steps { - echo "Setting up protection for release branch jammy" - sh '''#! /bin/bash - curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/jammy/protection \ - -d $(jq -c . << EOF - { - "required_status_checks": null, - "enforce_admins": false, - "required_pull_request_reviews": { - "dismiss_stale_reviews": false, - "require_code_owner_reviews": false, - "require_last_push_approval": false, - "required_approving_review_count": 1 - }, - "restrictions": null, - "required_linear_history": false, - "allow_force_pushes": false, - "allow_deletions": false, - "block_creations": false, - "required_conversation_resolution": true, - "lock_branch": false, - "allow_fork_syncing": false, - "required_signatures": false - } -EOF - ) ''' - } - } - // If this is a Pull request send the CI link as a comment on it - stage('Pull Request Comment') { - when { - not {environment name: 'CHANGE_ID', value: ''} - environment name: 'EXIT_STATUS', value: '' - } - steps { - sh '''#! /bin/bash - # Function to retrieve JSON data from URL - get_json() { - local url="$1" - local response=$(curl -s "$url") - if [ $? -ne 0 ]; then - echo "Failed to retrieve JSON data from $url" - return 1 - fi - local json=$(echo "$response" | jq .) - if [ $? -ne 0 ]; then - echo "Failed to parse JSON data from $url" - return 1 - fi - echo "$json" - } - - build_table() { - local data="$1" - - # Get the keys in the JSON data - local keys=$(echo "$data" | jq -r 'to_entries | map(.key) | .[]') - - # Check if keys are empty - if [ -z "$keys" ]; then - echo "JSON report data does not contain any keys or the report does not exist." - return 1 - fi - - # Build table header - local header="| Tag | Passed |\\n| --- | --- |\\n" - - # Loop through the JSON data to build the table rows - local rows="" - for build in $keys; do - local status=$(echo "$data" | jq -r ".[\\"$build\\"].test_success") - if [ "$status" = "true" ]; then - status="✅" - else - status="❌" - fi - local row="| "$build" | "$status" |\\n" - rows="${rows}${row}" - done - - local table="${header}${rows}" - local escaped_table=$(echo "$table" | sed 's/\"/\\\\"/g') - echo "$escaped_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}\\"}" - 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 - ''' - - } - } - } - /* ###################### - Send status to Discord - ###################### */ - post { - always { - sh '''#!/bin/bash - rm -rf /config/.ssh/id_sign - rm -rf /config/.ssh/id_sign.pub - git config --global --unset gpg.format - git config --global --unset user.signingkey - git config --global --unset commit.gpgsign - ''' - script{ - env.JOB_DATE = sh( - script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', - returnStdout: true).trim() - if (env.EXIT_STATUS == "ABORTED"){ - sh 'echo "build aborted"' - }else{ - if (currentBuild.currentResult == "SUCCESS"){ - if (env.GITHUBIMAGE =~ /lspipepr/){ - env.JOB_WEBHOOK_STATUS='Success' - env.JOB_WEBHOOK_COLOUR=3957028 - env.JOB_WEBHOOK_FOOTER='PR Build' - }else if (env.GITHUBIMAGE =~ /lsiodev/){ - env.JOB_WEBHOOK_STATUS='Success' - env.JOB_WEBHOOK_COLOUR=3957028 - env.JOB_WEBHOOK_FOOTER='Dev Build' - }else{ - env.JOB_WEBHOOK_STATUS='Success' - env.JOB_WEBHOOK_COLOUR=1681177 - env.JOB_WEBHOOK_FOOTER='Live Build' - } - }else{ - if (env.GITHUBIMAGE =~ /lspipepr/){ - env.JOB_WEBHOOK_STATUS='Failure' - env.JOB_WEBHOOK_COLOUR=12669523 - env.JOB_WEBHOOK_FOOTER='PR Build' - }else if (env.GITHUBIMAGE =~ /lsiodev/){ - env.JOB_WEBHOOK_STATUS='Failure' - env.JOB_WEBHOOK_COLOUR=12669523 - env.JOB_WEBHOOK_FOOTER='Dev Build' - }else{ - env.JOB_WEBHOOK_STATUS='Failure' - env.JOB_WEBHOOK_COLOUR=16711680 - env.JOB_WEBHOOK_FOOTER='Live Build' - } - } - sh ''' curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/jenkins-avatar.png","embeds": [{"'color'": '${JOB_WEBHOOK_COLOUR}',\ - "footer": {"text" : "'"${JOB_WEBHOOK_FOOTER}"'"},\ - "timestamp": "'${JOB_DATE}'",\ - "description": "**Build:** '${BUILD_NUMBER}'\\n**CI Results:** '${CI_URL}'\\n**ShellCheck Results:** '${SHELLCHECK_URL}'\\n**Status:** '${JOB_WEBHOOK_STATUS}'\\n**Job:** '${RUN_DISPLAY_URL}'\\n**Change:** '${CODE_URL}'\\n**External Release:**: '${RELEASE_LINK}'\\n**DockerHub:** '${DOCKERHUB_LINK}'\\n"}],\ - "username": "Jenkins"}' ${BUILDS_DISCORD} ''' - } - } - } - cleanup { - sh '''#! /bin/bash - echo "Pruning builder!!" - docker builder prune -f --builder container || : - containers=$(docker ps -q) - if [[ -n "${containers}" ]]; then - BUILDX_CONTAINER_ID=$(docker ps -qf 'name=buildx_buildkit') - for container in ${containers}; do - if [[ "${container}" == "${BUILDX_CONTAINER_ID}" ]]; then - echo "skipping buildx container in docker stop" - else - echo "Stopping container ${container}" - docker stop ${container} - fi - done - fi - docker system prune -f --volumes || : - docker image prune -af || : - ''' - cleanWs() - } - } -} - -def retry_backoff(int max_attempts, int power_base, Closure c) { - int n = 0 - while (n < max_attempts) { - try { - c() - return - } catch (err) { - if ((n + 1) >= max_attempts) { - throw err - } - sleep(power_base ** n) - n++ - } - } - return -} diff --git a/buildspec/merge_master.yaml b/buildspec/merge_master.yaml new file mode 100644 index 00000000..5213d2dd --- /dev/null +++ b/buildspec/merge_master.yaml @@ -0,0 +1,21 @@ +version: 0.2 +phases: + pre_build: + commands: + - export DOCKER_BUILDKIT=1 + - export ECR_ACCOUNT_ID="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f1)" + - echo Logging in to Amazon ECR... + - aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${FIPS_REPOSITORY_URI} + build: + commands: + - echo Building the Docker image... + - > + docker build + --build-arg ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID} + --tag ${FIPS_REPOSITORY_URI}:latest + . + + - docker image push --all-tags ${FIPS_REPOSITORY_URI} + post_build: + commands: + - echo Build completed! diff --git a/buildspec/push.yaml b/buildspec/push.yaml new file mode 100644 index 00000000..981878a5 --- /dev/null +++ b/buildspec/push.yaml @@ -0,0 +1,25 @@ +version: 0.2 +phases: + pre_build: + commands: + - export DOCKER_BUILDKIT=1 + - export ECR_ACCOUNT_ID="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f1)" + - export COMMIT_HASH_SHORT="$(echo $COMMIT_HASH | cut -c 1-7)" + - echo Logging in to Amazon ECR... + - aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${FIPS_REPOSITORY_URI} + build: + commands: + - echo Building the Docker image... + - echo $COMMIT_HASH_SHORT + - echo $BRANCH_NAME + - > + docker build + --build-arg ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID} + --tag ${FIPS_REPOSITORY_URI}:${COMMIT_HASH_SHORT} + --tag ${FIPS_REPOSITORY_URI}:${BRANCH_NAME} + . + - docker image push --all-tags ${FIPS_REPOSITORY_URI} + post_build: + commands: + - echo Build completed! + - printf '{"tag":"%s"}' $COMMIT_HASH_SHORT > build.json diff --git a/buildspec/release.yaml b/buildspec/release.yaml new file mode 100644 index 00000000..8f459c33 --- /dev/null +++ b/buildspec/release.yaml @@ -0,0 +1,28 @@ +version: 0.2 +phases: + pre_build: + commands: + - export DOCKER_BUILDKIT=1 + - export ECR_ACCOUNT_ID="$(echo $FIPS_REPOSITORY_URI | cut -d'.' -f1)" + - echo Logging in to Amazon ECR... + - aws ecr get-login-password --region ${AWS_DEFAULT_REGION} | docker login --username AWS --password-stdin ${FIPS_REPOSITORY_URI} + build: + commands: + - PATCH_TAG=${TAG_NAME#"v"} + - MINOR_TAG=${PATCH_TAG%.*} + - MAJOR_TAG=${MINOR_TAG%.*} + + - echo Building the Docker image... + - > + docker build + --build-arg ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID} + --tag ${FIPS_REPOSITORY_URI}:${PATCH_TAG} + --tag ${FIPS_REPOSITORY_URI}:${MINOR_TAG} + --tag ${FIPS_REPOSITORY_URI}:${MAJOR_TAG} + . + + - docker image push --all-tags ${FIPS_REPOSITORY_URI} + post_build: + commands: + - echo Build completed! + - printf '{"tag":"%s"}' $TAG_NAME > build.json diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..e7ea2f9a --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,22 @@ +--- +services: + docker-linuxserver-ubuntu-fips: + image: ${ECR_ACCOUNT_ID:-0123456789012}.dkr.ecr-fips.us-east-1.amazonaws.com/docker-linuxserver-ubuntu-fips:latest + pull_policy: build + build: + context: . + dockerfile: Dockerfile + target: linuxserver-base + platforms: + - linux/amd64 + args: + - BUILD_DATE=${BUILD_DATE:-2025-07-01T00:00:00Z} + - VERSION=${VERSION:-jammy-22.04} + - S6_OVERLAY_VERSION=${S6_OVERLAY_VERSION:-3.1.6.2} + - S6_OVERLAY_ARCH=${S6_OVERLAY_ARCH:-x86_64} + - MODS_VERSION=${MODS_VERSION:-v3} + - PKG_INST_VERSION=${PKG_INST_VERSION:-v1} + - LSIOWN_VERSION=${LSIOWN_VERSION:-v1} + - REL=${REL:-jammy} + - ARCH=${ARCH:-amd64} + - ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID:-0123456789012} diff --git a/jenkins-vars.yml b/jenkins-vars.yml deleted file mode 100644 index fbe75a86..00000000 --- a/jenkins-vars.yml +++ /dev/null @@ -1,26 +0,0 @@ ---- - -# jenkins variables -project_name: docker-baseimage-ubuntu -external_type: os -release_type: prerelease -release_tag: jammy -ls_branch: jammy -repo_vars: - - BUILD_VERSION_ARG = 'OS' - - LS_USER = 'linuxserver' - - LS_REPO = 'docker-baseimage-ubuntu' - - CONTAINER_NAME = 'baseimage-ubuntu' - - DOCKERHUB_IMAGE = 'lsiobase/ubuntu' - - DEV_DOCKERHUB_IMAGE = 'lsiodev/ubuntu' - - PR_DOCKERHUB_IMAGE = 'lspipepr/ubuntu' - - DIST_IMAGE = 'ubuntu' - - MULTIARCH='true' - - CI='true' - - CI_WEB='false' - - CI_PORT='80' - - CI_SSL='true' - - CI_DELAY='30' - - CI_DOCKERENV='LSIO_FIRST_PARTY=true' - - CI_AUTH='' - - CI_WEBPATH='' diff --git a/package_versions.txt b/package_versions.txt deleted file mode 100755 index 08ecaa74..00000000 --- a/package_versions.txt +++ /dev/null @@ -1,146 +0,0 @@ -NAME VERSION TYPE -adduser 3.118ubuntu5 deb -apt 2.4.14 deb -apt-utils 2.4.14 deb -base-files 12ubuntu4.7 deb -base-passwd 3.5.52build1 deb -bash 5.1-6ubuntu1.1 deb -bsdutils 1:2.37.2-4ubuntu3.4 deb -ca-certificates 20240203~22.04.1 deb -catatonit 0.1.7-1 deb -coreutils 8.32-4.1ubuntu1.2 deb -cron 3.0pl1-137ubuntu3 deb -curl 7.81.0-1ubuntu1.20 deb -dash 0.5.11+git20210903+057cd650a4ed-3build1 deb -debconf 1.5.79ubuntu1 deb -debianutils 5.5-1ubuntu2 deb -diffutils 1:3.8-0ubuntu2 deb -dirmngr 2.2.27-3ubuntu2.4 deb -dpkg 1.21.1ubuntu2.3 deb -e2fsprogs 1.46.5-2ubuntu1.2 deb -findutils 4.8.0-1ubuntu3 deb -gcc-12-base 12.3.0-1ubuntu1~22.04 deb -gnupg 2.2.27-3ubuntu2.4 deb -gnupg-l10n 2.2.27-3ubuntu2.4 deb -gnupg-utils 2.2.27-3ubuntu2.4 deb -gpg 2.2.27-3ubuntu2.4 deb -gpg-agent 2.2.27-3ubuntu2.4 deb -gpg-wks-client 2.2.27-3ubuntu2.4 deb -gpg-wks-server 2.2.27-3ubuntu2.4 deb -gpgconf 2.2.27-3ubuntu2.4 deb -gpgsm 2.2.27-3ubuntu2.4 deb -gpgv 2.2.27-3ubuntu2.4 deb -grep 3.7-1build1 deb -gzip 1.10-4ubuntu4.1 deb -hostname 3.23ubuntu2 deb -init-system-helpers 1.62 deb -jq 1.6-2.1ubuntu3 deb -libacl1 2.3.1-1 deb -libapt-pkg6.0 2.4.14 deb -libassuan0 2.5.5-1build1 deb -libattr1 1:2.5.1-1build1 deb -libaudit-common 1:3.0.7-1build1 deb -libaudit1 1:3.0.7-1build1 deb -libblkid1 2.37.2-4ubuntu3.4 deb -libbrotli1 1.0.9-2build6 deb -libbsd0 0.11.5-1 deb -libbz2-1.0 1.0.8-5build1 deb -libc-bin 2.35-0ubuntu3.10 deb -libc6 2.35-0ubuntu3.10 deb -libcap-ng0 0.7.9-2.2build3 deb -libcap2 1:2.44-1ubuntu0.22.04.2 deb -libcom-err2 1.46.5-2ubuntu1.2 deb -libcrypt1 1:4.4.27-1 deb -libcurl4 7.81.0-1ubuntu1.20 deb -libdb5.3 5.3.28+dfsg1-0.8ubuntu3 deb -libdebconfclient0 0.261ubuntu1 deb -libext2fs2 1.46.5-2ubuntu1.2 deb -libffi8 3.4.2-4 deb -libgcc-s1 12.3.0-1ubuntu1~22.04 deb -libgcrypt20 1.9.4-3ubuntu3 deb -libgmp10 2:6.2.1+dfsg-3ubuntu1 deb -libgnutls30 3.7.3-4ubuntu1.7 deb -libgpg-error0 1.43-3 deb -libgssapi-krb5-2 1.19.2-2ubuntu0.7 deb -libhogweed6 3.7.3-1build2 deb -libidn2-0 2.3.2-2build1 deb -libjq1 1.6-2.1ubuntu3 deb -libk5crypto3 1.19.2-2ubuntu0.7 deb -libkeyutils1 1.6.1-2ubuntu3 deb -libkrb5-3 1.19.2-2ubuntu0.7 deb -libkrb5support0 1.19.2-2ubuntu0.7 deb -libksba8 1.6.0-2ubuntu0.2 deb -libldap-2.5-0 2.5.19+dfsg-0ubuntu0.22.04.1 deb -libldap-common 2.5.19+dfsg-0ubuntu0.22.04.1 deb -liblz4-1 1.9.3-2build2 deb -liblzma5 5.2.5-2ubuntu1 deb -libmd0 1.0.4-1build1 deb -libmount1 2.37.2-4ubuntu3.4 deb -libncurses6 6.3-2ubuntu0.1 deb -libncursesw6 6.3-2ubuntu0.1 deb -libnettle8 3.7.3-1build2 deb -libnghttp2-14 1.43.0-1ubuntu0.2 deb -libnpth0 1.6-3build2 deb -libnsl2 1.3.0-2build2 deb -libonig5 6.9.7.1-2build1 deb -libp11-kit0 0.24.0-6build1 deb -libpam-modules 1.4.0-11ubuntu2.6 deb -libpam-modules-bin 1.4.0-11ubuntu2.6 deb -libpam-runtime 1.4.0-11ubuntu2.6 deb -libpam0g 1.4.0-11ubuntu2.6 deb -libpcre2-8-0 10.39-3ubuntu0.1 deb -libpcre3 2:8.39-13ubuntu0.22.04.1 deb -libprocps8 2:3.3.17-6ubuntu2.1 deb -libpsl5 0.21.0-1.2build2 deb -libreadline8 8.1.2-1 deb -librtmp1 2.4+20151223.gitfa8646d.1-2build4 deb -libsasl2-2 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules 2.1.27+dfsg2-3ubuntu1.2 deb -libsasl2-modules-db 2.1.27+dfsg2-3ubuntu1.2 deb -libseccomp2 2.5.3-2ubuntu3~22.04.1 deb -libselinux1 3.3-1build2 deb -libsemanage-common 3.3-1build2 deb -libsemanage2 3.3-1build2 deb -libsepol2 3.3-1build1 deb -libsmartcols1 2.37.2-4ubuntu3.4 deb -libsqlite3-0 3.37.2-2ubuntu0.4 deb -libss2 1.46.5-2ubuntu1.2 deb -libssh-4 0.9.6-2ubuntu0.22.04.4 deb -libssl3 3.0.2-0ubuntu1.19 deb -libstdc++6 12.3.0-1ubuntu1~22.04 deb -libsystemd0 249.11-0ubuntu3.16 deb -libtasn1-6 4.18.0-4ubuntu0.1 deb -libtinfo6 6.3-2ubuntu0.1 deb -libtirpc-common 1.3.2-2ubuntu0.1 deb -libtirpc3 1.3.2-2ubuntu0.1 deb -libudev1 249.11-0ubuntu3.16 deb -libunistring2 1.0-1 deb -libuuid1 2.37.2-4ubuntu3.4 deb -libxxhash0 0.8.1-1 deb -libzstd1 1.4.8+dfsg-3build1 deb -locales 2.35-0ubuntu3.10 deb -login 1:4.8.1-2ubuntu2.2 deb -logsave 1.46.5-2ubuntu1.2 deb -lsb-base 11.1.0ubuntu4 deb -mawk 1.3.4.20200120-3 deb -mount 2.37.2-4ubuntu3.4 deb -ncurses-base 6.3-2ubuntu0.1 deb -ncurses-bin 6.3-2ubuntu0.1 deb -netcat 1.218-4ubuntu1 deb -netcat-openbsd 1.218-4ubuntu1 deb -openssl 3.0.2-0ubuntu1.19 deb -passwd 1:4.8.1-2ubuntu2.2 deb -perl-base 5.34.0-3ubuntu1.4 deb -pinentry-curses 1.1.1-1build2 deb -procps 2:3.3.17-6ubuntu2.1 deb -publicsuffix 20211207.1025-1 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 2025b-0ubuntu0.22.04.1 deb -ubuntu-keyring 2021.03.26 deb -usrmerge 25ubuntu2 deb -util-linux 2.37.2-4ubuntu3.4 deb -zlib1g 1:1.2.11.dfsg-2ubuntu9.2 deb diff --git a/readme-vars.yml b/readme-vars.yml deleted file mode 100644 index aae30fa7..00000000 --- a/readme-vars.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- - -# project information -project_name: baseimage-ubuntu -full_custom_readme: | - {% raw -%} - [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) - - ## Contact information:- - - | Type | Address/Details | - | :---: | --- | - | Discord | [Discord](https://linuxserver.io/discord) | - | IRC | `#linuxserver.io` on irc.libera.chat | - | Forum | [Discourse](https://discourse.linuxserver.io/) | - - A custom base image built with [Ubuntu Linux](https://ubuntu.com) and [s6-overlay](https://github.com/just-containers/s6-overlay). - - - Support for using our base images in your own projects is provided on a Reasonable Endeavours basis, please see our [Support Policy](https://www.linuxserver.io/supportpolicy) for details. - - There is no `latest` tag for any of our base images, by design. We often make breaking changes between versions, and we don't publish release notes like we do for the downstream images. - - If you're intending to distribute an image using one of our bases, please read our [docs on container branding](https://docs.linuxserver.io/general/container-branding/) first. - - Ubuntu releases are supported for 5 years, after which we will stop building new base images for that version. - - The following line is only in this repo for loop testing: - - - { date: "01.01.50:", desc: "I am the release message for this internal repo." } - {%- endraw %} diff --git a/root/etc/s6-overlay/s6-rc.d/init-adduser/run b/root/etc/s6-overlay/s6-rc.d/init-adduser/run index a03a3e92..3e955a52 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-adduser/run +++ b/root/etc/s6-overlay/s6-rc.d/init-adduser/run @@ -28,5 +28,5 @@ User GID: $(id -g abc) " lsiown abc:abc /app -lsiown abc:abc /config +# lsiown abc:abc /config lsiown abc:abc /defaults diff --git a/sources.list b/sources.list deleted file mode 100644 index 6763c264..00000000 --- a/sources.list +++ /dev/null @@ -1,12 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu/ jammy main restricted -deb-src http://archive.ubuntu.com/ubuntu/ jammy main restricted -deb http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted -deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates main restricted -deb http://archive.ubuntu.com/ubuntu/ jammy universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ jammy universe multiverse -deb http://archive.ubuntu.com/ubuntu/ jammy-updates universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ jammy-updates universe multiverse -deb http://archive.ubuntu.com/ubuntu/ jammy-security main restricted -deb-src http://archive.ubuntu.com/ubuntu/ jammy-security main restricted -deb http://archive.ubuntu.com/ubuntu/ jammy-security universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ jammy-security universe multiverse diff --git a/sources.list.arm b/sources.list.arm deleted file mode 100644 index 6f714192..00000000 --- a/sources.list.arm +++ /dev/null @@ -1,12 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ jammy universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy universe -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-updates universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-updates universe -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ jammy-security universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ jammy-security universe From e5223eb5db699c4edbd9060b64cbae66e6cf491b Mon Sep 17 00:00:00 2001 From: Gabe Mendoza <6244640+thatguyinabeanie@users.noreply.github.com> Date: Fri, 25 Jul 2025 15:29:06 -0500 Subject: [PATCH 72/72] add buildspec/merge_jammy.yaml (#2) * merge_jammy * merge_jammy * jammy-latest --- buildspec/{merge_master.yaml => merge_jammy.yaml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename buildspec/{merge_master.yaml => merge_jammy.yaml} (92%) diff --git a/buildspec/merge_master.yaml b/buildspec/merge_jammy.yaml similarity index 92% rename from buildspec/merge_master.yaml rename to buildspec/merge_jammy.yaml index 5213d2dd..8f809e58 100644 --- a/buildspec/merge_master.yaml +++ b/buildspec/merge_jammy.yaml @@ -12,7 +12,7 @@ phases: - > docker build --build-arg ECR_ACCOUNT_ID=${ECR_ACCOUNT_ID} - --tag ${FIPS_REPOSITORY_URI}:latest + --tag ${FIPS_REPOSITORY_URI}:jammy-latest . - docker image push --all-tags ${FIPS_REPOSITORY_URI}