Skip to content

Commit 64a0649

Browse files
thelamerthelamer
committed
Master to Trixie, closes #123, closes #122, closes #118, bump selkies and pixelflux, fix stream switching from and to cpu mode, fix res clamping to max out at 4096, increase GOP length vaapi
1 parent ac1dab1 commit 64a0649

18 files changed

Lines changed: 938 additions & 712 deletions

File tree

‎Dockerfile‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM lscr.io/linuxserver/xvfb:debianbookworm AS xvfb
2+
FROM lscr.io/linuxserver/xvfb:debiantrixie AS xvfb
33
FROM ghcr.io/linuxserver/baseimage-alpine:3.22 AS frontend
44

55
RUN \
@@ -16,7 +16,7 @@ RUN \
1616
https://github.com/selkies-project/selkies.git \
1717
/src && \
1818
cd /src && \
19-
git checkout -f 159656dfb3f045bf6e041042140bafaf1bbd9c61
19+
git checkout -f 3ff61d3cc017e8492630bf0db2449bc556e20f2e
2020

2121
RUN \
2222
echo "**** build shared core library ****" && \
@@ -41,7 +41,7 @@ RUN \
4141
done
4242

4343
# Runtime stage
44-
FROM ghcr.io/linuxserver/baseimage-debian:bookworm
44+
FROM ghcr.io/linuxserver/baseimage-debian:trixie
4545

4646
# set version label
4747
ARG BUILD_DATE
@@ -72,7 +72,7 @@ RUN \
7272
/etc/dpkg/dpkg.cfg.d/docker && \
7373
echo "**** install deps ****" && \
7474
curl -fsSL https://download.docker.com/linux/debian/gpg | tee /usr/share/keyrings/docker.asc >/dev/null && \
75-
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable" > /etc/apt/sources.list.d/docker.list && \
75+
echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/debian trixie stable" > /etc/apt/sources.list.d/docker.list && \
7676
curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
7777
apt-get update && \
7878
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
@@ -93,12 +93,14 @@ RUN \
9393
fonts-noto-cjk \
9494
fonts-noto-color-emoji \
9595
fonts-noto-core \
96+
foot \
9697
fuse-overlayfs \
9798
g++ \
9899
gcc \
99100
git \
100101
intel-media-va-driver \
101102
kbd \
103+
labwc \
102104
libatk1.0-0 \
103105
libatk-bridge2.0-0 \
104106
libev4 \
@@ -114,11 +116,16 @@ RUN \
114116
libnginx-mod-http-fancyindex \
115117
libnotify-bin \
116118
libnss3 \
119+
libnvidia-egl-wayland1 \
117120
libopus0 \
118121
libp11-kit0 \
119122
libpam0g \
120123
libtasn1-6 \
121124
libvulkan1 \
125+
libwayland-client0 \
126+
libwayland-cursor0 \
127+
libwayland-egl1 \
128+
libwayland-server0 \
122129
libx11-6 \
123130
libxau6 \
124131
libxcb1 \
@@ -139,6 +146,7 @@ RUN \
139146
libxtst6 \
140147
locales-all \
141148
make \
149+
mesa-libgallium \
142150
mesa-va-drivers \
143151
mesa-vulkan-drivers \
144152
nginx \
@@ -151,13 +159,15 @@ RUN \
151159
pulseaudio-utils \
152160
python3 \
153161
python3-venv \
154-
software-properties-common \
155162
ssl-cert \
156163
stterm \
157164
sudo \
158165
tar \
159166
util-linux \
160167
vulkan-tools \
168+
wl-clipboard \
169+
wlr-randr \
170+
wtype \
161171
x11-apps \
162172
x11-common \
163173
x11-utils \
@@ -184,23 +194,23 @@ RUN \
184194
xutils \
185195
xvfb \
186196
zlib1g && \
187-
apt install -t bookworm-backports -y \
188-
mesa-libgallium && \
189197
echo "**** install selkies ****" && \
190198
SELKIES_RELEASE=$(curl -sX GET "https://api.github.com/repos/selkies-project/selkies/releases/latest" \
191199
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
192200
curl -o \
193201
/tmp/selkies.tar.gz -L \
194-
"https://github.com/selkies-project/selkies/archive/159656dfb3f045bf6e041042140bafaf1bbd9c61.tar.gz" && \
202+
"https://github.com/selkies-project/selkies/archive/3ff61d3cc017e8492630bf0db2449bc556e20f2e.tar.gz" && \
195203
cd /tmp && \
196204
tar xf selkies.tar.gz && \
197205
cd selkies-* && \
206+
sed -i '/"av>/d' pyproject.toml && \
207+
sed -i '/cryptography/d' pyproject.toml && \
198208
python3 \
199209
-m venv \
200210
--system-site-packages \
201211
/lsiopy && \
202212
pip install . && \
203-
pip install setuptools pixelflux==1.4.7 && \
213+
pip install setuptools && \
204214
echo "**** install selkies interposer ****" && \
205215
cd addons/js-interposer && \
206216
gcc -shared -fPIC -ldl \

‎Dockerfile.aarch64‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM lscr.io/linuxserver/xvfb:arm64v8-debianbookworm AS xvfb
2+
FROM lscr.io/linuxserver/xvfb:arm64v8-debiantrixie AS xvfb
33
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.22 AS frontend
44

55
RUN \
@@ -16,7 +16,7 @@ RUN \
1616
https://github.com/selkies-project/selkies.git \
1717
/src && \
1818
cd /src && \
19-
git checkout -f 159656dfb3f045bf6e041042140bafaf1bbd9c61
19+
git checkout -f 3ff61d3cc017e8492630bf0db2449bc556e20f2e
2020

2121
RUN \
2222
echo "**** build shared core library ****" && \
@@ -41,7 +41,7 @@ RUN \
4141
done
4242

4343
# Runtime stage
44-
FROM ghcr.io/linuxserver/baseimage-debian:arm64v8-bookworm
44+
FROM ghcr.io/linuxserver/baseimage-debian:arm64v8-trixie
4545

4646
# set version label
4747
ARG BUILD_DATE
@@ -72,7 +72,7 @@ RUN \
7272
/etc/dpkg/dpkg.cfg.d/docker && \
7373
echo "**** install deps ****" && \
7474
curl -fsSL https://download.docker.com/linux/debian/gpg | tee /usr/share/keyrings/docker.asc >/dev/null && \
75-
echo "deb [arch=arm64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/debian bookworm stable" > /etc/apt/sources.list.d/docker.list && \
75+
echo "deb [arch=arm64 signed-by=/usr/share/keyrings/docker.asc] https://download.docker.com/linux/debian trixie stable" > /etc/apt/sources.list.d/docker.list && \
7676
curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \
7777
apt-get update && \
7878
DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
@@ -93,11 +93,13 @@ RUN \
9393
fonts-noto-cjk \
9494
fonts-noto-color-emoji \
9595
fonts-noto-core \
96+
foot \
9697
fuse-overlayfs \
9798
g++ \
9899
gcc \
99100
git \
100101
kbd \
102+
labwc \
101103
libatk1.0-0 \
102104
libatk-bridge2.0-0 \
103105
libev4 \
@@ -113,11 +115,16 @@ RUN \
113115
libnginx-mod-http-fancyindex \
114116
libnotify-bin \
115117
libnss3 \
118+
libnvidia-egl-wayland1 \
116119
libopus0 \
117120
libp11-kit0 \
118121
libpam0g \
119122
libtasn1-6 \
120123
libvulkan1 \
124+
libwayland-client0 \
125+
libwayland-cursor0 \
126+
libwayland-egl1 \
127+
libwayland-server0 \
121128
libx11-6 \
122129
libxau6 \
123130
libxcb1 \
@@ -138,6 +145,7 @@ RUN \
138145
libxtst6 \
139146
locales-all \
140147
make \
148+
mesa-libgallium \
141149
mesa-va-drivers \
142150
mesa-vulkan-drivers \
143151
nginx \
@@ -150,13 +158,15 @@ RUN \
150158
pulseaudio-utils \
151159
python3 \
152160
python3-venv \
153-
software-properties-common \
154161
ssl-cert \
155162
stterm \
156163
sudo \
157164
tar \
158165
util-linux \
159166
vulkan-tools \
167+
wl-clipboard \
168+
wlr-randr \
169+
wtype \
160170
x11-apps \
161171
x11-common \
162172
x11-utils \
@@ -182,23 +192,23 @@ RUN \
182192
xutils \
183193
xvfb \
184194
zlib1g && \
185-
apt install -t bookworm-backports -y \
186-
mesa-libgallium && \
187195
echo "**** install selkies ****" && \
188196
SELKIES_RELEASE=$(curl -sX GET "https://api.github.com/repos/selkies-project/selkies/releases/latest" \
189197
| awk '/tag_name/{print $4;exit}' FS='[""]') && \
190198
curl -o \
191199
/tmp/selkies.tar.gz -L \
192-
"https://github.com/selkies-project/selkies/archive/159656dfb3f045bf6e041042140bafaf1bbd9c61.tar.gz" && \
200+
"https://github.com/selkies-project/selkies/archive/3ff61d3cc017e8492630bf0db2449bc556e20f2e.tar.gz" && \
193201
cd /tmp && \
194202
tar xf selkies.tar.gz && \
195203
cd selkies-* && \
204+
sed -i '/"av>/d' pyproject.toml && \
205+
sed -i '/cryptography/d' pyproject.toml && \
196206
python3 \
197207
-m venv \
198208
--system-site-packages \
199209
/lsiopy && \
200210
pip install . && \
201-
pip install setuptools pixelflux==1.4.7 && \
211+
pip install setuptools && \
202212
echo "**** install selkies interposer ****" && \
203213
cd addons/js-interposer && \
204214
gcc -shared -fPIC -ldl \

‎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}:debianbookworm 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}:debiantrixie 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 debianbookworm-${LS_RELEASE} 2>/dev/null)
112+
tagsha=$(git rev-list -n 1 debiantrixie-${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-debianbookworm-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-debianbookworm-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
201+
env.CI_TAGS = 'amd64-debiantrixie-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER + '|arm64v8-debiantrixie-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
202202
} else {
203-
env.CI_TAGS = 'debianbookworm-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
203+
env.CI_TAGS = 'debiantrixie-' + 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 = 'debianbookworm-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
207-
env.EXT_RELEASE_TAG = 'debianbookworm-version-' + env.EXT_RELEASE_CLEAN
206+
env.META_TAG = 'debiantrixie-' + env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
207+
env.EXT_RELEASE_TAG = 'debiantrixie-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
env.CITEST_IMAGETAG = 'latest'
210210
}
@@ -223,13 +223,13 @@ pipeline {
223223
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
224224
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
225225
if (env.MULTIARCH == 'true') {
226-
env.CI_TAGS = 'amd64-debianbookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-debianbookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
226+
env.CI_TAGS = 'amd64-debiantrixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '|arm64v8-debiantrixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
227227
} else {
228-
env.CI_TAGS = 'debianbookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
228+
env.CI_TAGS = 'debiantrixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
229229
}
230230
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
231-
env.META_TAG = 'debianbookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
232-
env.EXT_RELEASE_TAG = 'debianbookworm-version-' + env.EXT_RELEASE_CLEAN
231+
env.META_TAG = 'debiantrixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA
232+
env.EXT_RELEASE_TAG = 'debiantrixie-version-' + env.EXT_RELEASE_CLEAN
233233
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.DEV_DOCKERHUB_IMAGE + '/tags/'
234234
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'
235235
env.CITEST_IMAGETAG = 'develop'
@@ -248,13 +248,13 @@ pipeline {
248248
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
249249
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
250250
if (env.MULTIARCH == 'true') {
251-
env.CI_TAGS = 'amd64-debianbookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-debianbookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
251+
env.CI_TAGS = 'amd64-debiantrixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST + '|arm64v8-debiantrixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
252252
} else {
253-
env.CI_TAGS = 'debianbookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
253+
env.CI_TAGS = 'debiantrixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
254254
}
255255
env.VERSION_TAG = env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
256-
env.META_TAG = 'debianbookworm-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
257-
env.EXT_RELEASE_TAG = 'debianbookworm-version-' + env.EXT_RELEASE_CLEAN
256+
env.META_TAG = 'debiantrixie-' + env.EXT_RELEASE_CLEAN + '-pkg-' + env.PACKAGE_TAG + '-dev-' + env.COMMIT_SHA + '-pr-' + env.PULL_REQUEST
257+
env.EXT_RELEASE_TAG = 'debiantrixie-version-' + env.EXT_RELEASE_CLEAN
258258
env.CODE_URL = 'https://github.com/' + env.LS_USER + '/' + env.LS_REPO + '/pull/' + env.PULL_REQUEST
259259
env.DOCKERHUB_LINK = 'https://hub.docker.com/r/' + env.PR_DOCKERHUB_IMAGE + '/tags/'
260260
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'
@@ -826,7 +826,7 @@ pipeline {
826826
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
827827
-e TAGS=\"${CI_TAGS}\" \
828828
-e META_TAG=\"${META_TAG}\" \
829-
-e RELEASE_TAG=\"debianbookworm\" \
829+
-e RELEASE_TAG=\"debiantrixie\" \
830830
-e PORT=\"${CI_PORT}\" \
831831
-e SSL=\"${CI_SSL}\" \
832832
-e BASE=\"${DIST_IMAGE}\" \
@@ -866,7 +866,7 @@ pipeline {
866866
CACHEIMAGE=${i}
867867
fi
868868
done
869-
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:debianbookworm -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
869+
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${META_TAG} -t ${PUSHIMAGE}:debiantrixie -t ${PUSHIMAGE}:${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
870870
{ if [[ "${PUSHIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
871871
if [ -n "${SEMVER}" ]; then
872872
docker buildx imagetools create --prefer-index=false -t ${PUSHIMAGE}:${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
@@ -895,9 +895,9 @@ pipeline {
895895
CACHEIMAGE=${i}
896896
fi
897897
done
898-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-debianbookworm -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
898+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${META_TAG} -t ${MANIFESTIMAGE}:amd64-debiantrixie -t ${MANIFESTIMAGE}:amd64-${EXT_RELEASE_TAG} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
899899
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
900-
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-debianbookworm -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
900+
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:arm64v8-${META_TAG} -t ${MANIFESTIMAGE}:arm64v8-debiantrixie -t ${MANIFESTIMAGE}:arm64v8-${EXT_RELEASE_TAG} ${CACHEIMAGE}:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} || \
901901
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
902902
if [ -n "${SEMVER}" ]; then
903903
docker buildx imagetools create --prefer-index=false -t ${MANIFESTIMAGE}:amd64-${SEMVER} ${CACHEIMAGE}:amd64-${COMMIT_SHA}-${BUILD_NUMBER} || \
@@ -907,7 +907,7 @@ pipeline {
907907
fi
908908
done
909909
for MANIFESTIMAGE in "${IMAGE}" "${GITLABIMAGE}" "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
910-
docker buildx imagetools create -t ${MANIFESTIMAGE}:debianbookworm ${MANIFESTIMAGE}:amd64-debianbookworm ${MANIFESTIMAGE}:arm64v8-debianbookworm || \
910+
docker buildx imagetools create -t ${MANIFESTIMAGE}:debiantrixie ${MANIFESTIMAGE}:amd64-debiantrixie ${MANIFESTIMAGE}:arm64v8-debiantrixie || \
911911
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }
912912
docker buildx imagetools create -t ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} || \
913913
{ if [[ "${MANIFESTIMAGE}" != "${QUAYIMAGE}" ]]; then exit 1; fi; }

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ All base images are built for x86_64 and aarch64 platforms.
206206
| :----: | --- |
207207
| Alpine | alpine323 |
208208
| Arch | arch |
209-
| Debian | debianbookworm |
210209
| Debian | debiantrixie |
211210
| Enterprise Linux | el9 |
212211
| Fedora | fedora43 |

‎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-selkies
55
external_type: os
66
release_type: prerelease
7-
release_tag: debianbookworm
7+
release_tag: debiantrixie
88
ls_branch: master
99
build_armhf: false
1010
repo_vars:

0 commit comments

Comments
 (0)