Skip to content

Commit fc83b15

Browse files
thelamerthelamer
committed
trixie
1 parent 7cd7ef0 commit fc83b15

File tree

6 files changed

+40
-40
lines changed

6 files changed

+40
-40
lines changed

‎.github/workflows/call_issue_pr_tracker.yml‎

100755100644
File mode changed.

‎.github/workflows/call_issues_cron.yml‎

100755100644
File mode changed.

‎Dockerfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM alpine:3 as rootfs-stage
3+
FROM alpine:3 AS rootfs-stage
44

55
# environment
6-
ENV REL=bookworm
6+
ENV REL=trixie
77
ENV ARCH=amd64
88

99
# install packages
@@ -119,14 +119,14 @@ RUN \
119119
netcat-traditional \
120120
tzdata && \
121121
echo "**** add all sources ****" && \
122-
echo "deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
123-
echo "deb-src http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
124-
echo "deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
125-
echo "deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
126-
echo "deb http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
127-
echo "deb-src http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
128-
echo "deb http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
129-
echo "deb-src http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
122+
echo "deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
123+
echo "deb-src http://deb.debian.org/debian trixie main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
124+
echo "deb http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
125+
echo "deb-src http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
126+
echo "deb http://deb.debian.org/debian trixie-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
127+
echo "deb-src http://deb.debian.org/debian trixie-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
128+
echo "deb http://security.debian.org/debian-security/ trixie-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
129+
echo "deb-src http://security.debian.org/debian-security/ trixie-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
130130
rm -f /etc/apt/sources.list.d/debian.sources && \
131131
echo "**** generate locale ****" && \
132132
locale-gen en_US.UTF-8 && \

‎Dockerfile.aarch64‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM alpine:3 as rootfs-stage
3+
FROM alpine:3 AS rootfs-stage
44

55
# environment
6-
ENV REL=bookworm
6+
ENV REL=trixie
77
ENV ARCH=arm64v8
88

99
# install packages
@@ -119,14 +119,14 @@ RUN \
119119
netcat-traditional \
120120
tzdata && \
121121
echo "**** add all sources ****" && \
122-
echo "deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
123-
echo "deb-src http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
124-
echo "deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
125-
echo "deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
126-
echo "deb http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
127-
echo "deb-src http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
128-
echo "deb http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
129-
echo "deb-src http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
122+
echo "deb http://deb.debian.org/debian trixie main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
123+
echo "deb-src http://deb.debian.org/debian trixie main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
124+
echo "deb http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
125+
echo "deb-src http://deb.debian.org/debian trixie-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
126+
echo "deb http://deb.debian.org/debian trixie-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
127+
echo "deb-src http://deb.debian.org/debian trixie-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
128+
echo "deb http://security.debian.org/debian-security/ trixie-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
129+
echo "deb-src http://security.debian.org/debian-security/ trixie-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
130130
rm -f /etc/apt/sources.list.d/debian.sources && \
131131
echo "**** generate locale ****" && \
132132
locale-gen en_US.UTF-8 && \

‎Jenkinsfile‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ pipeline {
7676
script{
7777
env.EXIT_STATUS = ''
7878
env.LS_RELEASE = sh(
79-
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:bookworm 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
79+
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:trixie 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
8080
returnStdout: true).trim()
8181
env.LS_RELEASE_NOTES = sh(
8282
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 +109,7 @@ pipeline {
109109
script{
110110
env.LS_TAG_NUMBER = sh(
111111
script: '''#! /bin/bash
112-
tagsha=$(git rev-list -n 1 bookworm-${LS_RELEASE} 2>/dev/null)
112+
tagsha=$(git rev-list -n 1 trixie-${LS_RELEASE} 2>/dev/null)
113113
if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
114114
echo ${LS_RELEASE_NUMBER}
115115
elif [ -z "${GIT_COMMIT}" ]; then
@@ -198,13 +198,13 @@ pipeline {
198198
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
199199
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
200200
if (env.MULTIARCH == 'true') {
201-
env.CI_TAGS = 'amd64-bookworm-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-bookworm-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
201+
env.CI_TAGS = 'amd64-trixie-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-trixie-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
202202
} else {
203-
env.CI_TAGS = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
203+
env.CI_TAGS = 'trixie-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
204204
}
205205
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
206-
env.META_TAG = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
207-
env.EXT_RELEASE_TAG = 'bookworm-version-' + env.EXT_RELEASE_CLEAN
206+
env.META_TAG = 'trixie-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
207+
env.EXT_RELEASE_TAG = 'trixie-version-' + env.EXT_RELEASE_CLEAN
208208
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'
209209
}
210210
}
@@ -222,13 +222,13 @@ pipeline {
222222
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
223223
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
224224
if (env.MULTIARCH == 'true') {
225-
env.CI_TAGS = 'amd64-bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
225+
env.CI_TAGS = 'amd64-trixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-trixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
226226
} else {
227-
env.CI_TAGS = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
227+
env.CI_TAGS = 'trixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
228228
}
229229
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
230-
env.META_TAG = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
231-
env.EXT_RELEASE_TAG = 'bookworm-version-' + env.EXT_RELEASE_CLEAN
230+
env.META_TAG = 'trixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
231+
env.EXT_RELEASE_TAG = 'trixie-version-' + env.EXT_RELEASE_CLEAN
232232
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
233233
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'
234234
}
@@ -246,13 +246,13 @@ pipeline {
246246
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
247247
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
248248
if (env.MULTIARCH == 'true') {
249-
env.CI_TAGS = 'amd64-bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
249+
env.CI_TAGS = 'amd64-trixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-trixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
250250
} else {
251-
env.CI_TAGS = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
251+
env.CI_TAGS = 'trixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
252252
}
253253
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
254-
env.META_TAG = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
255-
env.EXT_RELEASE_TAG = 'bookworm-version-' + env.EXT_RELEASE_CLEAN
254+
env.META_TAG = 'trixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
255+
env.EXT_RELEASE_TAG = 'trixie-version-' + env.EXT_RELEASE_CLEAN
256256
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
257257
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
258258
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'
@@ -815,7 +815,7 @@ pipeline {
815815
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
816816
-e TAGS=\"${CI_TAGS}\" \
817817
-e META_TAG=\"${META_TAG}\" \
818-
-e RELEASE_TAG=\"bookworm\" \
818+
-e RELEASE_TAG=\"trixie\" \
819819
-e PORT=\"${CI_PORT}\" \
820820
-e SSL=\"${CI_SSL}\" \
821821
-e BASE=\"${DIST_IMAGE}\" \
@@ -853,7 +853,7 @@ pipeline {
853853
CACHEIMAGE=${i}
854854
fi
855855
done
856-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:bookworm -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
856+
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:trixie -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
857857
if [ -n "${SEMVER}" ]; then
858858
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
859859
fi
@@ -880,15 +880,15 @@ pipeline {
880880
CACHEIMAGE=${i}
881881
fi
882882
done
883-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-bookworm -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
884-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-bookworm -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
883+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-trixie -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
884+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-trixie -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
885885
if [ -n "${SEMVER}" ]; then
886886
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER}
887887
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${SEMVER} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER}
888888
fi
889889
done
890890
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
891-
docker buildx imagetools create -t ${MANIFESTIMAGE}:bookworm ${MANIFESTIMAGE}:amd64-bookworm ${MANIFESTIMAGE}:arm64v8-bookworm
891+
docker buildx imagetools create -t ${MANIFESTIMAGE}:trixie ${MANIFESTIMAGE}:amd64-trixie ${MANIFESTIMAGE}:arm64v8-trixie
892892
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
893893
894894
docker buildx imagetools create -t ${MANIFESTIMAGE}:${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}

‎jenkins-vars.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
project_name: docker-baseimage-debian
55
external_type: os
66
release_type: stable
7-
release_tag: bookworm
7+
release_tag: trixie
88
ls_branch: master
99
image_sbom: true
1010
image_provenance: true

0 commit comments

Comments
 (0)