Skip to content

Commit 55e67fd

Browse files
thelamerthelamer
committed
change master over to bookworm
1 parent 4dd4e7b commit 55e67fd

File tree

4 files changed

+53
-51
lines changed

4 files changed

+53
-51
lines changed

‎Dockerfile‎

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

3-
FROM alpine:3.17 as rootfs-stage
3+
FROM alpine:3.18 as rootfs-stage
44

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

99
# install packages
@@ -109,17 +109,18 @@ RUN \
109109
curl \
110110
gnupg \
111111
jq \
112-
netcat \
112+
netcat-traditional \
113113
tzdata && \
114114
echo "**** add all sources ****" && \
115-
echo "deb http://deb.debian.org/debian bullseye main contrib non-free" > /etc/apt/sources.list && \
116-
echo "deb-src http://deb.debian.org/debian bullseye main contrib non-free" >> /etc/apt/sources.list && \
117-
echo "deb http://deb.debian.org/debian bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \
118-
echo "deb-src http://deb.debian.org/debian bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \
119-
echo "deb http://deb.debian.org/debian bullseye-backports main contrib non-free" >> /etc/apt/sources.list && \
120-
echo "deb-src http://deb.debian.org/debian bullseye-backports main contrib non-free" >> /etc/apt/sources.list && \
121-
echo "deb http://security.debian.org/debian-security/ bullseye-security main contrib non-free" >> /etc/apt/sources.list && \
122-
echo "deb-src http://security.debian.org/debian-security/ bullseye-security main contrib non-free" >> /etc/apt/sources.list && \
115+
echo "deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
116+
echo "deb-src http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
117+
echo "deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
118+
echo "deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
119+
echo "deb http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
120+
echo "deb-src http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
121+
echo "deb http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
122+
echo "deb-src http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
123+
rm -f /etc/apt/sources.list.d/debian.sources && \
123124
echo "**** generate locale ****" && \
124125
locale-gen en_US.UTF-8 && \
125126
echo "**** create abc user and make our folders ****" && \

‎Dockerfile.aarch64‎

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

3-
FROM alpine:3.17 as rootfs-stage
3+
FROM alpine:3.18 as rootfs-stage
44

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

99
# install packages
@@ -109,17 +109,18 @@ RUN \
109109
curl \
110110
gnupg \
111111
jq \
112-
netcat \
112+
netcat-traditional \
113113
tzdata && \
114114
echo "**** add all sources ****" && \
115-
echo "deb http://deb.debian.org/debian bullseye main contrib non-free" > /etc/apt/sources.list && \
116-
echo "deb-src http://deb.debian.org/debian bullseye main contrib non-free" >> /etc/apt/sources.list && \
117-
echo "deb http://deb.debian.org/debian bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \
118-
echo "deb-src http://deb.debian.org/debian bullseye-updates main contrib non-free" >> /etc/apt/sources.list && \
119-
echo "deb http://deb.debian.org/debian bullseye-backports main contrib non-free" >> /etc/apt/sources.list && \
120-
echo "deb-src http://deb.debian.org/debian bullseye-backports main contrib non-free" >> /etc/apt/sources.list && \
121-
echo "deb http://security.debian.org/debian-security/ bullseye-security main contrib non-free" >> /etc/apt/sources.list && \
122-
echo "deb-src http://security.debian.org/debian-security/ bullseye-security main contrib non-free" >> /etc/apt/sources.list && \
115+
echo "deb http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" > /etc/apt/sources.list && \
116+
echo "deb-src http://deb.debian.org/debian bookworm main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
117+
echo "deb http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
118+
echo "deb-src http://deb.debian.org/debian bookworm-updates main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
119+
echo "deb http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
120+
echo "deb-src http://deb.debian.org/debian bookworm-backports main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
121+
echo "deb http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
122+
echo "deb-src http://security.debian.org/debian-security/ bookworm-security main contrib non-free non-free-firmware" >> /etc/apt/sources.list && \
123+
rm -f /etc/apt/sources.list.d/debian.sources && \
123124
echo "**** generate locale ****" && \
124125
locale-gen en_US.UTF-8 && \
125126
echo "**** create abc user and make our folders ****" && \

‎Jenkinsfile‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pipeline {
4848
script{
4949
env.EXIT_STATUS = ''
5050
env.LS_RELEASE = sh(
51-
script: '''docker run --rm quay.io/skopeo/stable:v1 inspect docker://ghcr.io/${LS_USER}/${CONTAINER_NAME}:bullseye 2>/dev/null | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
51+
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' || : ''',
5252
returnStdout: true).trim()
5353
env.LS_RELEASE_NOTES = sh(
5454
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' ''',
@@ -72,7 +72,7 @@ pipeline {
7272
script{
7373
env.LS_TAG_NUMBER = sh(
7474
script: '''#! /bin/bash
75-
tagsha=$(git rev-list -n 1 bullseye-${LS_RELEASE} 2>/dev/null)
75+
tagsha=$(git rev-list -n 1 bookworm-${LS_RELEASE} 2>/dev/null)
7676
if [ "${tagsha}" == "${COMMIT_SHA}" ]; then
7777
echo ${LS_RELEASE_NUMBER}
7878
elif [ -z "${GIT_COMMIT}" ]; then
@@ -161,13 +161,13 @@ pipeline {
161161
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
162162
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
163163
if (env.MULTIARCH == 'true') {
164-
env.CI_TAGS = 'amd64-bullseye-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-bullseye-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
164+
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
165165
} else {
166-
env.CI_TAGS = 'bullseye-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
166+
env.CI_TAGS = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
167167
}
168168
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
169-
env.META_TAG = 'bullseye-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
170-
env.EXT_RELEASE_TAG = 'bullseye-version-' + env.EXT_RELEASE_CLEAN
169+
env.META_TAG = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
170+
env.EXT_RELEASE_TAG = 'bookworm-version-' + env.EXT_RELEASE_CLEAN
171171
}
172172
}
173173
}
@@ -184,13 +184,13 @@ pipeline {
184184
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
185185
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
186186
if (env.MULTIARCH == 'true') {
187-
env.CI_TAGS = 'amd64-bullseye-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-bullseye-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
187+
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
188188
} else {
189-
env.CI_TAGS = 'bullseye-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
189+
env.CI_TAGS = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
190190
}
191191
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
192-
env.META_TAG = 'bullseye-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
193-
env.EXT_RELEASE_TAG = 'bullseye-version-' + env.EXT_RELEASE_CLEAN
192+
env.META_TAG = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
193+
env.EXT_RELEASE_TAG = 'bookworm-version-' + env.EXT_RELEASE_CLEAN
194194
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
195195
}
196196
}
@@ -207,13 +207,13 @@ pipeline {
207207
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
208208
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
209209
if (env.MULTIARCH == 'true') {
210-
env.CI_TAGS = 'amd64-bullseye-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-bullseye-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
210+
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
211211
} else {
212-
env.CI_TAGS = 'bullseye-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
212+
env.CI_TAGS = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
213213
}
214214
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
215-
env.META_TAG = 'bullseye-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
216-
env.EXT_RELEASE_TAG = 'bullseye-version-' + env.EXT_RELEASE_CLEAN
215+
env.META_TAG = 'bookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
216+
env.EXT_RELEASE_TAG = 'bookworm-version-' + env.EXT_RELEASE_CLEAN
217217
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
218218
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
219219
}
@@ -684,12 +684,12 @@ pipeline {
684684
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
685685
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${QUAYIMAGE}" "${IMAGE}"; do
686686
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
687-
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:bullseye
687+
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:bookworm
688688
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${EXT_RELEASE_TAG}
689689
if [ -n "${SEMVER}" ]; then
690690
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:${SEMVER}
691691
fi
692-
docker push ${PUSHIMAGE}:bullseye
692+
docker push ${PUSHIMAGE}:bookworm
693693
docker push ${PUSHIMAGE}:${META_TAG}
694694
docker push ${PUSHIMAGE}:${EXT_RELEASE_TAG}
695695
if [ -n "${SEMVER}" ]; then
@@ -735,28 +735,28 @@ pipeline {
735735
fi
736736
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
737737
docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
738-
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-bullseye
738+
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-bookworm
739739
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
740740
docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
741-
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-bullseye
741+
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-bookworm
742742
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
743743
if [ -n "${SEMVER}" ]; then
744744
docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${SEMVER}
745745
docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${SEMVER}
746746
fi
747747
docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
748748
docker push ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG}
749-
docker push ${MANIFESTIMAGE}:amd64-bullseye
749+
docker push ${MANIFESTIMAGE}:amd64-bookworm
750750
docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
751-
docker push ${MANIFESTIMAGE}:arm64v8-bullseye
751+
docker push ${MANIFESTIMAGE}:arm64v8-bookworm
752752
docker push ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG}
753753
if [ -n "${SEMVER}" ]; then
754754
docker push ${MANIFESTIMAGE}:amd64-${SEMVER}
755755
docker push ${MANIFESTIMAGE}:arm64v8-${SEMVER}
756756
fi
757-
docker manifest push --purge ${MANIFESTIMAGE}:bullseye || :
758-
docker manifest create ${MANIFESTIMAGE}:bullseye ${MANIFESTIMAGE}:amd64-bullseye ${MANIFESTIMAGE}:arm64v8-bullseye
759-
docker manifest annotate ${MANIFESTIMAGE}:bullseye ${MANIFESTIMAGE}:arm64v8-bullseye --os linux --arch arm64 --variant v8
757+
docker manifest push --purge ${MANIFESTIMAGE}:bookworm || :
758+
docker manifest create ${MANIFESTIMAGE}:bookworm ${MANIFESTIMAGE}:amd64-bookworm ${MANIFESTIMAGE}:arm64v8-bookworm
759+
docker manifest annotate ${MANIFESTIMAGE}:bookworm ${MANIFESTIMAGE}:arm64v8-bookworm --os linux --arch arm64 --variant v8
760760
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
761761
docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
762762
docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
@@ -772,13 +772,13 @@ pipeline {
772772
digest=$(curl -s \
773773
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
774774
--header "Authorization: Bearer ${token}" \
775-
"https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-bullseye")
775+
"https://ghcr.io/v2/linuxserver/${CONTAINER_NAME}/manifests/arm32v7-bookworm")
776776
if [[ $(echo "$digest" | jq -r '.layers') != "null" ]]; then
777-
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-bullseye || :
778-
docker manifest create ${MANIFESTIMAGE}:arm32v7-bullseye ${MANIFESTIMAGE}:amd64-bullseye
779-
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-bullseye
777+
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-bookworm || :
778+
docker manifest create ${MANIFESTIMAGE}:arm32v7-bookworm ${MANIFESTIMAGE}:amd64-bookworm
779+
docker manifest push --purge ${MANIFESTIMAGE}:arm32v7-bookworm
780780
fi
781-
docker manifest push --purge ${MANIFESTIMAGE}:bullseye
781+
docker manifest push --purge ${MANIFESTIMAGE}:bookworm
782782
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
783783
docker manifest push --purge ${MANIFESTIMAGE}:${EXT_RELEASE_TAG}
784784
if [ -n "${SEMVER}" ]; then

‎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: bullseye
7+
release_tag: bookworm
88
ls_branch: master
99
build_armhf: false
1010
repo_vars:

0 commit comments

Comments
 (0)