diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4fafc874..2a1010bf 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -24,7 +24,7 @@ ## Readme If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit. -Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-baseimage-ubuntu/edit/noble/readme-vars.yml). +Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-baseimage-ubuntu/edit/resolute/readme-vars.yml). These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play. Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io) @@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Update the changelog -If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-baseimage-ubuntu/tree/noble/root), add an entry to the changelog +If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-baseimage-ubuntu/tree/resolute/root), add an entry to the changelog ```yml changelogs: diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 112bde38..ff8524f5 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -21,7 +21,7 @@ ------------------------------ - - [ ] I have read the [contributing](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/noble/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications + - [ ] I have read the [contributing](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/resolute/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications ------------------------------ diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index cf2ef808..69ddc422 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -7,13 +7,13 @@ permissions: contents: read jobs: - external-trigger-noble: + external-trigger-resolute: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4.1.1 - name: External Trigger - if: github.ref == 'refs/heads/noble' + if: github.ref == 'refs/heads/resolute' env: SKIP_EXTERNAL_TRIGGER: ${{ vars.SKIP_EXTERNAL_TRIGGER }} run: | @@ -21,7 +21,7 @@ jobs: echo "Type is \`os\`" >> $GITHUB_STEP_SUMMARY echo "No external release, exiting" >> $GITHUB_STEP_SUMMARY exit 0 - if grep -q "^baseimage-ubuntu_noble_${EXT_RELEASE}" <<< "${SKIP_EXTERNAL_TRIGGER}"; then + if grep -q "^baseimage-ubuntu_resolute_${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 diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml index 35724e30..d04889f9 100644 --- a/.github/workflows/greetings.yml +++ b/.github/workflows/greetings.yml @@ -15,5 +15,5 @@ jobs: - 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/noble/.github/PULL_REQUEST_TEMPLATE.md)!' + pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-baseimage-ubuntu/blob/resolute/.github/PULL_REQUEST_TEMPLATE.md)!' repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/Dockerfile b/Dockerfile index c1b3b8c3..8e23265a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,8 @@ FROM alpine:3 AS rootfs-stage # environment -ENV REL=noble ENV ARCH=amd64 -ENV TAG=oci-noble-24.04 +ENV TAG=oci-resolute-26.04 # install packages RUN \ @@ -40,7 +39,7 @@ RUN \ /build # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.2.1.0" +ARG S6_OVERLAY_VERSION="3.2.2.0" ARG S6_OVERLAY_ARCH="x86_64" # add s6 overlay @@ -85,11 +84,10 @@ ENV HOME="/root" \ PATH="/lsiopy/bin:$PATH" # copy sources -COPY sources.list /etc/apt/ +COPY ubuntu.sources /etc/apt/sources.d/ubuntu.sources RUN \ echo "**** Ripped from Ubuntu Docker Logic ****" && \ - rm -f /etc/apt/sources.list.d/ubuntu.sources && \ set -xe && \ echo '#!/bin/sh' \ > /usr/sbin/policy-rc.d && \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 09850b4a..663ed047 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -3,9 +3,8 @@ FROM alpine:3 AS rootfs-stage # environment -ENV REL=noble ENV ARCH=arm64 -ENV TAG=oci-noble-24.04 +ENV TAG=oci-resolute-26.04 # install packages RUN \ @@ -40,7 +39,7 @@ RUN \ /build # set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.2.1.0" +ARG S6_OVERLAY_VERSION="3.2.2.0" ARG S6_OVERLAY_ARCH="aarch64" # add s6 overlay @@ -85,11 +84,10 @@ ENV HOME="/root" \ PATH="/lsiopy/bin:$PATH" # copy sources -COPY sources.list.arm /etc/apt/sources.list +COPY ubuntu.sources.arm /etc/apt/sources.d/ubuntu.sources RUN \ echo "**** Ripped from Ubuntu Docker Logic ****" && \ - rm -f /etc/apt/sources.list.d/ubuntu.sources && \ set -xe && \ echo '#!/bin/sh' \ > /usr/sbin/policy-rc.d && \ diff --git a/Dockerfile.riscv64 b/Dockerfile.riscv64 deleted file mode 100644 index 974530c9..00000000 --- a/Dockerfile.riscv64 +++ /dev/null @@ -1,163 +0,0 @@ -# syntax=docker/dockerfile:1 - -FROM alpine:3 AS rootfs-stage - -# environment -ENV REL=noble -ENV ARCH=riscv64 -ENV TAG=oci-noble-24.04 - -# install packages -RUN \ - apk add --no-cache \ - bash \ - curl \ - git \ - jq \ - tzdata \ - xz - -# grab base tarball -RUN \ - git clone --depth=1 https://git.launchpad.net/cloud-images/+oci/ubuntu-base -b ${TAG} /build && \ - cd /build/oci && \ - DIGEST=$(jq -r '.manifests[0].digest[7:]' < index.json) && \ - cd /build/oci/blobs/sha256 && \ - if jq -e '.layers // empty' < "${DIGEST}" >/dev/null 2>&1; then \ - TARBALL=$(jq -r '.layers[0].digest[7:]' < ${DIGEST}); \ - else \ - MULTIDIGEST=$(jq -r ".manifests[] | select(.platform.architecture == \"${ARCH}\") | .digest[7:]" < ${DIGEST}) && \ - TARBALL=$(jq -r '.layers[0].digest[7:]' < ${MULTIDIGEST}); \ - fi && \ - mkdir /root-out && \ - tar xf \ - ${TARBALL} -C \ - /root-out && \ - rm -rf \ - /root-out/var/log/* \ - /root-out/home/ubuntu \ - /root-out/root/{.ssh,.bashrc,.profile} \ - /build - -# set version for s6 overlay -ARG S6_OVERLAY_VERSION="3.2.1.0" -ARG S6_OVERLAY_ARCH="riscv64" - -# 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 && unlink /root-out/usr/bin/with-contenv -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" -ARG WITHCONTENV_VERSION="v1" -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="TheLamer" - -ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/docker-mods.${MODS_VERSION}" "/docker-mods" -ADD --chmod=755 "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=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/lsiown.${LSIOWN_VERSION}" "/usr/bin/lsiown" -ADD --chmod=755 "https://raw.githubusercontent.com/linuxserver/docker-mods/mod-scripts/with-contenv.${WITHCONTENV_VERSION}" "/usr/bin/with-contenv" - -# 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.riscv /etc/apt/sources.list - -RUN \ - echo "**** Ripped from Ubuntu Docker Logic ****" && \ - rm -f /etc/apt/sources.list.d/ubuntu.sources && \ - 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-openbsd \ - systemd-standalone-sysusers \ - 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 "**** cleanup ****" && \ - userdel ubuntu && \ - 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 index f5389357..c4a180a8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -75,8 +75,10 @@ pipeline { ''' script{ env.EXIT_STATUS = '' + env.CI_TEST_ATTEMPTED = '' + env.PUSH_ATTEMPTED = '' env.LS_RELEASE = sh( - script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:noble 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''', + script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:resolute 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' ''', @@ -109,7 +111,7 @@ pipeline { script{ env.LS_TAG_NUMBER = sh( script: '''#! /bin/bash - tagsha=$(git rev-list -n 1 noble-${LS_RELEASE} 2>/dev/null) + tagsha=$(git rev-list -n 1 resolute-${LS_RELEASE} 2>/dev/null) if [ "${tagsha}" == "${COMMIT_SHA}" ]; then echo ${LS_RELEASE_NUMBER} elif [ -z "${GIT_COMMIT}" ]; then @@ -185,10 +187,10 @@ pipeline { } } } - // If this is a noble build use live docker endpoints + // If this is a resolute build use live docker endpoints stage("Set ENV live build"){ when { - branch "noble" + branch "resolute" environment name: 'CHANGE_ID', value: '' } steps { @@ -198,13 +200,13 @@ pipeline { 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-noble-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|riscv64-noble-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-noble-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'amd64-resolute-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-resolute-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } else { - env.CI_TAGS = 'noble-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.CI_TAGS = 'resolute-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - env.META_TAG = 'noble-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER - env.EXT_RELEASE_TAG = 'noble-version-' + env.EXT_RELEASE_CLEAN + env.META_TAG = 'resolute-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + env.EXT_RELEASE_TAG = 'resolute-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' env.CITEST_IMAGETAG = 'latest' } @@ -213,7 +215,7 @@ pipeline { // If this is a dev build use dev docker endpoints stage("Set ENV dev build"){ when { - not {branch "noble"} + not {branch "resolute"} environment name: 'CHANGE_ID', value: '' } steps { @@ -223,13 +225,13 @@ pipeline { 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-noble-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|riscv64-noble-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-noble-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'amd64-resolute-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-resolute-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA } else { - env.CI_TAGS = 'noble-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.CI_TAGS = 'resolute-' + 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 = 'noble-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA - env.EXT_RELEASE_TAG = 'noble-version-' + env.EXT_RELEASE_CLEAN + env.META_TAG = 'resolute-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + env.EXT_RELEASE_TAG = 'resolute-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' env.CITEST_IMAGETAG = 'develop' @@ -248,13 +250,13 @@ pipeline { env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME if (env.MULTIARCH == 'true') { - env.CI_TAGS = 'amd64-noble-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|riscv64-noble-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-noble-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'amd64-resolute-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-resolute-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST } else { - env.CI_TAGS = 'noble-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.CI_TAGS = 'resolute-' + 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 = 'noble-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST - env.EXT_RELEASE_TAG = 'noble-version-' + env.EXT_RELEASE_CLEAN + env.META_TAG = 'resolute-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + env.EXT_RELEASE_TAG = 'resolute-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' @@ -293,7 +295,7 @@ pipeline { // Use helper containers to render templated files stage('Update-Templates') { when { - branch "noble" + branch "resolute" environment name: 'CHANGE_ID', value: '' expression { env.CONTAINER_NAME != null @@ -305,24 +307,24 @@ pipeline { TEMPDIR=$(mktemp -d) docker pull ghcr.io/linuxserver/jenkins-builder:latest # Cloned repo paths for templating: - # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch noble of ${LS_USER}/${LS_REPO} for running the jenkins builder on - # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch noble of ${LS_USER}/${LS_REPO} for commiting various templated file changes and pushing back to Github + # ${TEMPDIR}/docker-${CONTAINER_NAME}: Cloned branch resolute of ${LS_USER}/${LS_REPO} for running the jenkins builder on + # ${TEMPDIR}/repo/${LS_REPO}: Cloned branch resolute 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 noble --depth 1 https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/docker-${CONTAINER_NAME} + git clone --branch resolute --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 noble + git checkout -f resolute 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 noble - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git noble + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git resolute + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git resolute echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} echo "Updating Jenkinsfile and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} @@ -341,13 +343,13 @@ pipeline { 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 noble + git checkout -f resolute 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 noble - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git noble + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git resolute + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git resolute 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} @@ -363,7 +365,7 @@ pipeline { 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 noble + git checkout -f resolute cd ${TEMPDIR}/docker-${CONTAINER_NAME} mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/workflows mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github/ISSUE_TEMPLATE @@ -376,8 +378,8 @@ pipeline { 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 noble - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git noble + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git resolute + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git resolute echo "true" > /tmp/${COMMIT_SHA}-${BUILD_NUMBER} echo "Updating templates and exiting build, new one will trigger based on commit" rm -Rf ${TEMPDIR} @@ -444,7 +446,7 @@ pipeline { // Exit the build if the Templated files were just updated stage('Template-exit') { when { - branch "noble" + branch "resolute" environment name: 'CHANGE_ID', value: '' environment name: 'FILES_UPDATED', value: 'true' expression { @@ -457,10 +459,10 @@ pipeline { } } } - // If this is a noble build check the S6 service file perms + // If this is a resolute build check the S6 service file perms stage("Check S6 Service file Permissions"){ when { - branch "noble" + branch "resolute" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } @@ -705,81 +707,12 @@ pipeline { ''' } } - stage('Build RISCV64') { - agent { - label 'RISCV64' - } - 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.riscv64 -t ${IMAGE}:riscv64-${META_TAG} --platform=linux/riscv64 \ - --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}:riscv64-${META_TAG} ${i}:riscv64-${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 - declare -A pids - IFS=',' read -ra CACHE <<< "$BUILDCACHE" - for i in "${CACHE[@]}"; do - docker push ${i}:riscv64-${COMMIT_SHA}-${BUILD_NUMBER} & - pids[$!]="$i" - done - for p in "${!pids[@]}"; do - wait "$p" || { [[ "${pids[$p]}" != *"quay.io"* ]] && 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 "noble" + branch "resolute" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } @@ -802,14 +735,14 @@ pipeline { 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 noble + git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f resolute 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 noble - git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git noble + git pull https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git resolute + git push https://LinuxServer-CI:${GITHUB_TOKEN}@github.com/${LS_USER}/${LS_REPO}.git resolute echo "true" > /tmp/packages-${COMMIT_SHA}-${BUILD_NUMBER} echo "Package tag updated, stopping build process" else @@ -827,7 +760,7 @@ pipeline { // Exit the build if the package file was just updated stage('PACKAGE-exit') { when { - branch "noble" + branch "resolute" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'true' environment name: 'EXIT_STATUS', value: '' @@ -841,7 +774,7 @@ pipeline { // Exit the build if this is just a package check and there are no changes to push stage('PACKAGECHECK-exit') { when { - branch "noble" + branch "resolute" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'false' environment name: 'EXIT_STATUS', value: '' @@ -872,6 +805,7 @@ pipeline { 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' + env.CI_TEST_ATTEMPTED = 'true' } sh '''#! /bin/bash set -e @@ -887,8 +821,6 @@ pipeline { 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} - docker pull ghcr.io/linuxserver/lsiodev-buildcache:riscv64-${COMMIT_SHA}-${BUILD_NUMBER} --platform=riscv64 - docker tag ghcr.io/linuxserver/lsiodev-buildcache:riscv64-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:riscv64-${META_TAG} fi docker run --rm \ --shm-size=1gb \ @@ -897,7 +829,7 @@ pipeline { -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \ -e TAGS=\"${CI_TAGS}\" \ -e META_TAG=\"${META_TAG}\" \ - -e RELEASE_TAG=\"noble\" \ + -e RELEASE_TAG=\"resolute\" \ -e PORT=\"${CI_PORT}\" \ -e SSL=\"${CI_SSL}\" \ -e BASE=\"${DIST_IMAGE}\" \ @@ -926,6 +858,9 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + script{ + env.PUSH_ATTEMPTED = 'true' + } retry_backoff(5,5) { sh '''#! /bin/bash set -e @@ -937,7 +872,7 @@ pipeline { CACHEIMAGE=${i} fi done - docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:noble -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \ + docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:resolute -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \ { if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } if [ -n "${SEMVER}" ]; then docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \ @@ -955,41 +890,44 @@ pipeline { environment name: 'EXIT_STATUS', value: '' } steps { + script{ + env.PUSH_ATTEMPTED = 'true' + } retry_backoff(5,5) { sh '''#! /bin/bash set -e for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - [[ ${MANIFESTIMAGE%%/*} =~ \\. ]] && MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" || MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + if [[ "${MANIFESTIMAGE%%/*}" =~ \\. ]]; then + MANIFESTIMAGEPLUS="${MANIFESTIMAGE}" + else + MANIFESTIMAGEPLUS="docker.io/${MANIFESTIMAGE}" + fi 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-noble -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \ - { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-noble -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \ + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-resolute -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:riscv64-${META_TAG} -t ${MANIFESTIMAGE}:riscv64-noble -t ${MANIFESTIMAGE}:riscv64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:riscv64-${COMMIT_SHA}-${BUILD_NUMBER} || \ + docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-resolute -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } if [ -n "${SEMVER}" ]; then docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } - docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:riscv64-${SEMVER} ${CACHEIMAGE}:riscv64-${COMMIT_SHA}-${BUILD_NUMBER} || \ - { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } fi done for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do - docker buildx imagetools create -t ${MANIFESTIMAGE}:noble ${MANIFESTIMAGE}:amd64-noble ${MANIFESTIMAGE}:riscv64-noble ${MANIFESTIMAGE}:arm64v8-noble || \ + docker buildx imagetools create -t ${MANIFESTIMAGE}:resolute ${MANIFESTIMAGE}:amd64-resolute ${MANIFESTIMAGE}:arm64v8-resolute || \ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } - docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:riscv64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \ + docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } - docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:riscv64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \ + docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} || \ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } if [ -n "${SEMVER}" ]; then - docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:riscv64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \ + docker buildx imagetools create -t ${MANIFESTIMAGE}:${SEMVER} ${MANIFESTIMAGE}:amd64-${SEMVER} ${MANIFESTIMAGE}:arm64v8-${SEMVER} || \ { if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; } fi done @@ -1000,7 +938,7 @@ pipeline { // If this is a public release tag it in the LS Github stage('Github-Tag-Push-Release') { when { - branch "noble" + branch "resolute" expression { env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -1016,21 +954,21 @@ pipeline { else AUTO_RELEASE_NOTES=$(curl -fsL -H "Authorization: token ${GITHUB_TOKEN}" -H "Accept: application/vnd.github+json" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases/generate-notes \ -d '{"tag_name":"'${META_TAG}'",\ - "target_commitish": "noble"}' \ + "target_commitish": "resolute"}' \ | jq -r '.body' | sed 's|## What.s Changed||') fi echo "Pushing New tag for current commit ${META_TAG}" 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 noble",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to resolute",\ "type": "commit",\ "tagger": {"name": "LinuxServer-CI","email": "ci@linuxserver.io","date": "'${GITHUB_DATE}'"}}' echo "Pushing New release for Tag" echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json jq -n \ --arg tag_name "$META_TAG" \ - --arg target_commitish "noble" \ + --arg target_commitish "resolute" \ --arg ci_url "${CI_URL:-N/A}" \ --arg ls_notes "$AUTO_RELEASE_NOTES" \ --arg remote_notes "$(cat releasebody.json)" \ @@ -1040,7 +978,7 @@ pipeline { "name": $tag_name, "body": ("**CI Report:**\\n\\n" + $ci_url + "\\n\\n**LinuxServer Changes:**\\n\\n" + $ls_notes + "\\n\\n**Remote Changes:**\\n\\n" + $remote_notes), "draft": false, - "prerelease": false }' > releasebody.json.done + "prerelease": true }' > 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 ''' } @@ -1048,14 +986,14 @@ pipeline { // Add protection to the release branch stage('Github-Release-Branch-Protection') { when { - branch "noble" + branch "resolute" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } steps { - echo "Setting up protection for release branch noble" + echo "Setting up protection for release branch resolute" sh '''#! /bin/bash - curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/noble/protection \ + curl -H "Authorization: token ${GITHUB_TOKEN}" -X PUT https://api.github.com/repos/${LS_USER}/${LS_REPO}/branches/resolute/protection \ -d $(jq -c . << EOF { "required_status_checks": null, @@ -1080,98 +1018,13 @@ 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 + Comment on PR and 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{ + script { env.JOB_DATE = sh( script: '''date '+%Y-%m-%dT%H:%M:%S%:z' ''', returnStdout: true).trim() @@ -1214,6 +1067,94 @@ EOF "username": "Jenkins"}' ${BUILDS_DISCORD} ''' } } + script { + if (env.GITHUBIMAGE =~ /lspipepr/){ + if (env.CI_TEST_ATTEMPTED == "true" || env.PUSH_ATTEMPTED == "true"){ + 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 for commit ${COMMIT_SHA:0:7} : \\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 for commit ${COMMIT_SHA:0:7} : \\n\\n\\`${GITHUBIMAGE}:${META_TAG}\\`\\"}" + fi + ''' + } else { + sh '''#! /bin/bash + 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, the build for PR commit ${COMMIT_SHA:0:7} failed and as a result no CI test was attempted and no images were pushed.\\"}" + ''' + } + } + } + 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 + ''' } cleanup { sh '''#! /bin/bash diff --git a/README.md b/README.md index e34ab839..5045ad00 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ - + [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io) ## Contact information:- diff --git a/jenkins-vars.yml b/jenkins-vars.yml index bb4b3ec8..6cba045f 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,10 +3,9 @@ # jenkins variables project_name: docker-baseimage-ubuntu external_type: os -release_type: stable -release_tag: noble -ls_branch: noble -build_riscv64: true +release_type: prerelease +release_tag: resolute +ls_branch: resolute repo_vars: - BUILD_VERSION_ARG = 'OS' - LS_USER = 'linuxserver' diff --git a/package_versions.txt b/package_versions.txt index e391790e..d69fa2f5 100755 --- a/package_versions.txt +++ b/package_versions.txt @@ -1,142 +1,160 @@ -NAME VERSION TYPE -adduser 3.137ubuntu1 deb -apt 2.8.3 deb -apt-utils 2.8.3 deb -base-files 13ubuntu10.4 deb -base-passwd 3.6.3build1 deb -bash 5.2.21-2ubuntu4 deb -bsdutils 1:2.39.3-9ubuntu6.4 deb -ca-certificates 20240203 deb -catatonit 0.1.7-1 deb -coreutils 9.4-3ubuntu6.1 deb -cron 3.0pl1-184ubuntu2 deb -cron-daemon-common 3.0pl1-184ubuntu2 deb -curl 8.5.0-2ubuntu10.7 deb -dash 0.5.12-6ubuntu5 deb -debconf 1.5.86ubuntu1 deb -debianutils 5.17build1 deb -diffutils 1:3.10-1build1 deb -dirmngr 2.4.4-2ubuntu17.4 deb -dpkg 1.22.6ubuntu6.5 deb -e2fsprogs 1.47.0-2.4~exp1ubuntu4.1 deb -findutils 4.9.0-5build1 deb -gcc-14-base 14.2.0-4ubuntu2~24.04.1 deb -gnupg 2.4.4-2ubuntu17.4 deb -gnupg-l10n 2.4.4-2ubuntu17.4 deb -gnupg-utils 2.4.4-2ubuntu17.4 deb -gpg 2.4.4-2ubuntu17.4 deb -gpg-agent 2.4.4-2ubuntu17.4 deb -gpg-wks-client 2.4.4-2ubuntu17.4 deb -gpgconf 2.4.4-2ubuntu17.4 deb -gpgsm 2.4.4-2ubuntu17.4 deb -gpgv 2.4.4-2ubuntu17.4 deb -grep 3.11-4build1 deb -gzip 1.12-1ubuntu3.1 deb -hostname 3.23+nmu2ubuntu2 deb -init-system-helpers 1.66ubuntu1 deb -jq 1.7.1-3ubuntu0.24.04.1 deb -keyboxd 2.4.4-2ubuntu17.4 deb -krb5-locales 1.20.1-6ubuntu2.6 deb -libacl1 2.3.2-1build1.1 deb -libapt-pkg6.0t64 2.8.3 deb -libassuan0 2.5.6-1build1 deb -libattr1 1:2.5.2-1build1.1 deb -libaudit-common 1:3.1.2-2.1build1.1 deb -libaudit1 1:3.1.2-2.1build1.1 deb -libblkid1 2.39.3-9ubuntu6.4 deb -libbrotli1 1.1.0-2build2 deb -libbsd0 0.12.1-1build1.1 deb -libbz2-1.0 1.0.8-5.1build0.1 deb -libc-bin 2.39-0ubuntu8.7 deb -libc6 2.39-0ubuntu8.7 deb -libcap-ng0 0.8.4-2build2 deb -libcap2 1:2.66-5ubuntu2.2 deb -libcom-err2 1.47.0-2.4~exp1ubuntu4.1 deb -libcrypt1 1:4.4.36-4build1 deb -libcurl4t64 8.5.0-2ubuntu10.7 deb -libdb5.3t64 5.3.28+dfsg2-7 deb -libdebconfclient0 0.271ubuntu3 deb -libext2fs2t64 1.47.0-2.4~exp1ubuntu4.1 deb -libffi8 3.4.6-1build1 deb -libgcc-s1 14.2.0-4ubuntu2~24.04.1 deb -libgcrypt20 1.10.3-2build1 deb -libgmp10 2:6.3.0+dfsg-2ubuntu6.1 deb -libgnutls30t64 3.8.3-1.1ubuntu3.5 deb -libgpg-error0 1.47-3build2.1 deb -libgssapi-krb5-2 1.20.1-6ubuntu2.6 deb -libhogweed6t64 3.9.1-2.2build1.1 deb -libidn2-0 2.3.7-2build1.1 deb -libjq1 1.7.1-3ubuntu0.24.04.1 deb -libk5crypto3 1.20.1-6ubuntu2.6 deb -libkeyutils1 1.6.3-3build1 deb -libkrb5-3 1.20.1-6ubuntu2.6 deb -libkrb5support0 1.20.1-6ubuntu2.6 deb -libksba8 1.6.6-1build1 deb -libldap-common 2.6.10+dfsg-0ubuntu0.24.04.1 deb -libldap2 2.6.10+dfsg-0ubuntu0.24.04.1 deb -liblz4-1 1.9.4-1build1.1 deb -liblzma5 5.6.1+really5.4.5-1ubuntu0.2 deb -libmd0 1.1.0-2build1.1 deb -libmount1 2.39.3-9ubuntu6.4 deb -libncursesw6 6.4+20240113-1ubuntu2 deb -libnettle8t64 3.9.1-2.2build1.1 deb -libnghttp2-14 1.59.0-1ubuntu0.2 deb -libnpth0t64 1.6-3.1build1 deb -libonig5 6.9.9-1build1 deb -libp11-kit0 0.25.3-4ubuntu2.1 deb -libpam-modules 1.5.3-5ubuntu5.5 deb -libpam-modules-bin 1.5.3-5ubuntu5.5 deb -libpam-runtime 1.5.3-5ubuntu5.5 deb -libpam0g 1.5.3-5ubuntu5.5 deb -libpcre2-8-0 10.42-4ubuntu2.1 deb -libproc2-0 2:4.0.4-4ubuntu3.2 deb -libpsl5t64 0.21.2-1.1build1 deb -libreadline8t64 8.2-4build1 deb -librtmp1 2.4+20151223.gitfa8646d.1-2build7 deb -libsasl2-2 2.1.28+dfsg1-5ubuntu3.1 deb -libsasl2-modules 2.1.28+dfsg1-5ubuntu3.1 deb -libsasl2-modules-db 2.1.28+dfsg1-5ubuntu3.1 deb -libseccomp2 2.5.5-1ubuntu3.1 deb -libselinux1 3.5-2ubuntu2.1 deb -libsemanage-common 3.5-1build5 deb -libsemanage2 3.5-1build5 deb -libsepol2 3.5-2build1 deb -libsmartcols1 2.39.3-9ubuntu6.4 deb -libsqlite3-0 3.45.1-1ubuntu2.5 deb -libss2 1.47.0-2.4~exp1ubuntu4.1 deb -libssh-4 0.10.6-2ubuntu0.3 deb -libssl3t64 3.0.13-0ubuntu3.7 deb -libstdc++6 14.2.0-4ubuntu2~24.04.1 deb -libsystemd0 255.4-1ubuntu8.12 deb -libtasn1-6 4.19.0-3ubuntu0.24.04.2 deb -libtinfo6 6.4+20240113-1ubuntu2 deb -libudev1 255.4-1ubuntu8.12 deb -libunistring5 1.1-2build1.1 deb -libuuid1 2.39.3-9ubuntu6.4 deb -libxxhash0 0.8.2-2build1 deb -libzstd1 1.5.5+dfsg2-2build1.1 deb -locales 2.39-0ubuntu8.7 deb -login 1:4.13+dfsg1-4ubuntu3.2 deb -logsave 1.47.0-2.4~exp1ubuntu4.1 deb -mawk 1.3.4.20240123-1build1 deb -mount 2.39.3-9ubuntu6.4 deb -ncurses-base 6.4+20240113-1ubuntu2 deb -ncurses-bin 6.4+20240113-1ubuntu2 deb -netcat-openbsd 1.226-1ubuntu2 deb -openssl 3.0.13-0ubuntu3.7 deb -passwd 1:4.13+dfsg1-4ubuntu3.2 deb -perl-base 5.38.2-3.2ubuntu0.2 deb -pinentry-curses 1.2.1-3ubuntu5 deb -procps 2:4.0.4-4ubuntu3.2 deb -publicsuffix 20231001.0357-0.1 deb -readline-common 8.2-4build1 deb -sed 4.9-2build1 deb -sensible-utils 0.0.22 deb -systemd-standalone-sysusers 255.4-1ubuntu8.12 deb -sysvinit-utils 3.08-6ubuntu3 deb -tar 1.35+dfsg-3build1 deb -tzdata 2025b-0ubuntu0.24.04.1 deb -ubuntu-keyring 2023.11.28.1 deb -unminimize 0.2.1 deb -util-linux 2.39.3-9ubuntu6.4 deb -zlib1g 1:1.3.dfsg-3.1ubuntu2.1 deb +NAME VERSION TYPE +adduser 3.153ubuntu1 deb +apt 3.2.0 deb +apt-utils 3.2.0 deb +base-files 14ubuntu6.1 deb +base-passwd 3.6.8 deb +bash 5.3-2ubuntu1 deb +bash-completion 1:2.16.0-8build1 deb +bsdutils 1:2.41.3-3ubuntu2 deb +ca-certificates 20260223 deb +catatonit 0.2.1-2build1 deb +coreutils 9.5-1ubuntu2+0.0.0~ubuntu25 deb +coreutils-from-uutils 0.0.0~ubuntu25 deb +cron 3.0pl1-200ubuntu1 deb +cron-daemon-common 3.0pl1-200ubuntu1 deb +curl 8.18.0-1ubuntu2.1 deb +dash 0.5.12-12ubuntu3 deb +debconf 1.5.92 deb +debianutils 5.23.2build1 deb +diffutils 1:3.12-1 deb +dirmngr 2.4.8-4ubuntu3 deb +dpkg 1.23.7ubuntu1 deb +e2fsprogs 1.47.2-3ubuntu4 deb +findutils 4.10.0-3build2 deb +gcc-16-base 16-20260322-1ubuntu1 deb +github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 go-module +github.com/canonical/go-flags v0.0.0-20230403090104-105d09a091b8 go-module +github.com/canonical/pebble v1.30.2-0.20260416224941-1b3384178e3f go-module +github.com/canonical/x-go v0.0.0-20230522092633-7947a7587f5b go-module +github.com/gorilla/mux v1.8.1 go-module +github.com/gorilla/websocket v1.5.1 go-module +github.com/pkg/term v1.1.0 go-module +gnu-coreutils 9.7-3ubuntu2 deb +gnupg 2.4.8-4ubuntu3 deb +gnupg-l10n 2.4.8-4ubuntu3 deb +gnupg-utils 2.4.8-4ubuntu3 deb +golang.org/x/net v0.40.0 go-module +golang.org/x/sys v0.33.0 go-module +golang.org/x/term v0.32.0 go-module +gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 go-module +gopkg.in/yaml.v2 v2.4.0 go-module +gopkg.in/yaml.v3 v3.0.1 go-module +gpg 2.4.8-4ubuntu3 deb +gpg-agent 2.4.8-4ubuntu3 deb +gpg-wks-client 2.4.8-4ubuntu3 deb +gpgconf 2.4.8-4ubuntu3 deb +gpgsm 2.4.8-4ubuntu3 deb +gpgv 2.4.8-4ubuntu3 deb +grep 3.12-1 deb +gzip 1.14-1~exp2ubuntu1 deb +hostname 3.25build1 deb +init-system-helpers 1.69 deb +jq 1.8.1-4ubuntu2 deb +krb5-locales 1.22.1-2ubuntu4 deb +libacl1 2.3.2-2 deb +libapt-pkg7.0 3.2.0 deb +libassuan9 3.0.2-2build1 deb +libattr1 1:2.5.2-4 deb +libaudit-common 1:4.1.2-1build1 deb +libaudit1 1:4.1.2-1build1 deb +libblkid1 2.41.3-3ubuntu2 deb +libbrotli1 1.2.0-3build1 deb +libbsd0 0.12.2-2build2 deb +libbz2-1.0 1.0.8-6build2 deb +libc-bin 2.43-2ubuntu2 deb +libc-gconv-modules-extra 2.43-2ubuntu2 deb +libc6 2.43-2ubuntu2 deb +libcap-ng0 0.8.5-4build5 deb +libcom-err2 1.47.2-3ubuntu4 deb +libcrypt1 1:4.5.1-1 deb +libcurl4t64 8.18.0-1ubuntu2.1 deb +libdb5.3t64 5.3.28+dfsg2-10ubuntu1 deb +libdebconfclient0 0.280ubuntu1 deb +libext2fs2t64 1.47.2-3ubuntu4 deb +libffi8 3.5.2-4 deb +libgcc-s1 16-20260322-1ubuntu1 deb +libgcrypt20 1.12.0-2 deb +libgmp10 2:6.3.0+dfsg-5ubuntu2 deb +libgnutls30t64 3.8.12-2ubuntu1 deb +libgpg-error0 1.58-2 deb +libgssapi-krb5-2 1.22.1-2ubuntu4 deb +libhogweed6t64 3.10.2-1 deb +libidn2-0 2.3.8-4build1 deb +libjq1 1.8.1-4ubuntu2 deb +libk5crypto3 1.22.1-2ubuntu4 deb +libkeyutils1 1.6.3-6ubuntu3 deb +libkrb5-3 1.22.1-2ubuntu4 deb +libkrb5support0 1.22.1-2ubuntu4 deb +libksba8 1.6.7-2build1 deb +libldap-common 2.6.10+dfsg-1ubuntu5 deb +libldap2 2.6.10+dfsg-1ubuntu5 deb +liblz4-1 1.10.0-8 deb +liblzma5 5.8.3-1 deb +libmd0 1.1.0-2build4 deb +libmount1 2.41.3-3ubuntu2 deb +libncursesw6 6.6+20251231-1 deb +libnettle8t64 3.10.2-1 deb +libnghttp2-14 1.68.0-2ubuntu0.1 deb +libnpth0t64 1.8-3build1 deb +libonig5 6.9.10-1build1 deb +libp11-kit0 0.26.2-2 deb +libpam-modules 1.7.0-5ubuntu3 deb +libpam-modules-bin 1.7.0-5ubuntu3 deb +libpam-runtime 1.7.0-5ubuntu3 deb +libpam0g 1.7.0-5ubuntu3 deb +libpcre2-8-0 10.46-1build1 deb +libproc2-0 2:4.0.4-9ubuntu1 deb +libpsl5t64 0.21.2-1.1build2 deb +libreadline8t64 8.3-4 deb +librtmp1 2.4+20151223.gitfa8646d.1-3 deb +libsasl2-2 2.1.28+dfsg1-9ubuntu3 deb +libsasl2-modules 2.1.28+dfsg1-9ubuntu3 deb +libsasl2-modules-db 2.1.28+dfsg1-9ubuntu3 deb +libseccomp2 2.6.0-2ubuntu5 deb +libselinux1 3.9-4build1 deb +libsemanage-common 3.9-1build1 deb +libsemanage2 3.9-1build1 deb +libsepol2 3.9-2 deb +libsmartcols1 2.41.3-3ubuntu2 deb +libsqlite3-0 3.46.1-9 deb +libss2 1.47.2-3ubuntu4 deb +libssh2-1t64 1.11.1-1build2 deb +libssl3t64 3.5.5-1ubuntu3 deb +libstdc++6 16-20260322-1ubuntu1 deb +libsystemd0 259.5-0ubuntu3 deb +libtasn1-6 4.21.0-2 deb +libtinfo6 6.6+20251231-1 deb +libudev1 259.5-0ubuntu3 deb +libunistring5 1.3-2build1 deb +libuuid1 2.41.3-3ubuntu2 deb +libxxhash0 0.8.3-2build1 deb +libzstd1 1.5.7+dfsg-3 deb +locales 2.43-2ubuntu2 deb +login 1:4.16.0-2+really2.41.3-3ubuntu2 deb +login.defs 1:4.17.4-2ubuntu3 deb +logsave 1.47.2-3ubuntu4 deb +mawk 1.3.4.20260129-1 deb +mount 2.41.3-3ubuntu2 deb +ncurses-base 6.6+20251231-1 deb +ncurses-bin 6.6+20251231-1 deb +netcat-openbsd 1.234-1 deb +openssl 3.5.5-1ubuntu3 deb +openssl-provider-legacy 3.5.5-1ubuntu3 deb +passwd 1:4.17.4-2ubuntu3 deb +perl-base 5.40.1-7build1 deb +pinentry-curses 1.3.2-3ubuntu1 deb +procps 2:4.0.4-9ubuntu1 deb +publicsuffix 20260129.1928-1 deb +readline-common 8.3-4 deb +rust-coreutils 0.8.0-0ubuntu3 deb +sed 4.9-2ubuntu1 deb +sensible-utils 0.0.26build1 deb +stdlib go1.26.2 go-module +systemd-standalone-sysusers 259.5-0ubuntu3 deb +sysvinit-utils 3.15-5ubuntu1 deb +tar 1.35+dfsg-4 deb +tzdata 2026a-3ubuntu1 deb +ubuntu-keyring 2023.11.28.1build1 deb +util-linux 2.41.3-3ubuntu2 deb +zlib1g 1:1.3.dfsg+really1.3.1-1ubuntu3 deb diff --git a/sources.list b/sources.list deleted file mode 100644 index 510e4637..00000000 --- a/sources.list +++ /dev/null @@ -1,12 +0,0 @@ -deb http://archive.ubuntu.com/ubuntu/ noble main restricted -deb-src http://archive.ubuntu.com/ubuntu/ noble main restricted -deb http://archive.ubuntu.com/ubuntu/ noble-updates main restricted -deb-src http://archive.ubuntu.com/ubuntu/ noble-updates main restricted -deb http://archive.ubuntu.com/ubuntu/ noble universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ noble universe multiverse -deb http://archive.ubuntu.com/ubuntu/ noble-updates universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ noble-updates universe multiverse -deb http://archive.ubuntu.com/ubuntu/ noble-security main restricted -deb-src http://archive.ubuntu.com/ubuntu/ noble-security main restricted -deb http://archive.ubuntu.com/ubuntu/ noble-security universe multiverse -deb-src http://archive.ubuntu.com/ubuntu/ noble-security universe multiverse diff --git a/sources.list.arm b/sources.list.arm deleted file mode 100644 index 5bd1aff3..00000000 --- a/sources.list.arm +++ /dev/null @@ -1,12 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ noble main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ noble-updates main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble-updates main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ noble universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble universe -deb http://ports.ubuntu.com/ubuntu-ports/ noble-updates universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble-updates universe -deb http://ports.ubuntu.com/ubuntu-ports/ noble-security main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble-security main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ noble-security universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble-security universe diff --git a/sources.list.riscv b/sources.list.riscv deleted file mode 100644 index 5bd1aff3..00000000 --- a/sources.list.riscv +++ /dev/null @@ -1,12 +0,0 @@ -deb http://ports.ubuntu.com/ubuntu-ports/ noble main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ noble-updates main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble-updates main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ noble universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble universe -deb http://ports.ubuntu.com/ubuntu-ports/ noble-updates universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble-updates universe -deb http://ports.ubuntu.com/ubuntu-ports/ noble-security main restricted multiverse -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble-security main restricted multiverse -deb http://ports.ubuntu.com/ubuntu-ports/ noble-security universe -deb-src http://ports.ubuntu.com/ubuntu-ports/ noble-security universe diff --git a/ubuntu.sources b/ubuntu.sources new file mode 100644 index 00000000..e7c3dbe0 --- /dev/null +++ b/ubuntu.sources @@ -0,0 +1,11 @@ +Types: deb +URIs: https://archive.ubuntu.com/ubuntu/ +Suites: resolute resolute-updates resolute-backports +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg + +Types: deb +URIs: https://security.ubuntu.com/ubuntu/ +Suites: resolute-security +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg diff --git a/ubuntu.sources.arm b/ubuntu.sources.arm new file mode 100644 index 00000000..677d6137 --- /dev/null +++ b/ubuntu.sources.arm @@ -0,0 +1,11 @@ +Types: deb +URIs: http://ports.ubuntu.com/ubuntu-ports +Suites: resolute resolute-updates resolute-backports +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg + +Types: deb +URIs: https://ports.ubuntu.com/ubuntu-ports +Suites: resolute-security +Components: main restricted universe multiverse +Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg