Skip to content

Commit 8b0ba2e

Browse files
authored
Merge pull request #13 from linuxserver/trixie
2 parents 4089d5d + 908f881 commit 8b0ba2e

6 files changed

Lines changed: 16 additions & 9 deletions

File tree

Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ghcr.io/linuxserver/baseimage-selkies:debianbookworm
1+
# syntax=docker/dockerfile:1
2+
3+
FROM ghcr.io/linuxserver/baseimage-selkies:debiantrixie
24

35
# set version label
46
ARG BUILD_DATE
@@ -34,7 +36,8 @@ RUN \
3436
echo "**** application tweaks ****" && \
3537
mv \
3638
/usr/bin/webcord \
37-
/usr/bin/webcord-real && \
39+
/usr/bin/webcord-real && \
40+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
3841
echo "**** cleanup ****" && \
3942
apt-get autoclean && \
4043
rm -rf \

Dockerfile.aarch64

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-debianbookworm
1+
# syntax=docker/dockerfile:1
2+
3+
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-debiantrixie
24

35
# set version label
46
ARG BUILD_DATE
@@ -34,7 +36,8 @@ RUN \
3436
echo "**** application tweaks ****" && \
3537
mv \
3638
/usr/bin/webcord \
37-
/usr/bin/webcord-real && \
39+
/usr/bin/webcord-real && \
40+
printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \
3841
echo "**** cleanup ****" && \
3942
apt-get autoclean && \
4043
rm -rf \

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pipeline {
2929
DOCKERHUB_IMAGE = 'linuxserver/webcord'
3030
DEV_DOCKERHUB_IMAGE = 'lsiodev/webcord'
3131
PR_DOCKERHUB_IMAGE = 'lspipepr/webcord'
32-
DIST_IMAGE = 'ubuntu'
32+
DIST_IMAGE = 'debian'
3333
MULTIARCH = 'true'
3434
CI = 'true'
3535
CI_WEB = 'true'

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
428428

429429
## Versions
430430

431-
* **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED.
431+
* **10.08.25:** - Rebase to Debian Trixie.
432+
* **12.07.25:** - Switch to Selkies base image, HTTPS IS NOW REQUIRED.
432433
* **03.04.25:** - Update chromium launch options to improve performance.
433434
* **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon.
434435
* **06.01.24:** - Rebase to Debian Bookworm.

jenkins-vars.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ external_type: github_stable
66
release_type: stable
77
release_tag: latest
88
ls_branch: master
9-
build_armhf: false
109
repo_vars:
1110
- EXT_GIT_BRANCH = 'master'
1211
- EXT_USER = 'SpacingBat3'
@@ -18,7 +17,7 @@ repo_vars:
1817
- DOCKERHUB_IMAGE = 'linuxserver/webcord'
1918
- DEV_DOCKERHUB_IMAGE = 'lsiodev/webcord'
2019
- PR_DOCKERHUB_IMAGE = 'lspipepr/webcord'
21-
- DIST_IMAGE = 'ubuntu'
20+
- DIST_IMAGE = 'debian'
2221
- MULTIARCH = 'true'
2322
- CI = 'true'
2423
- CI_WEB = 'true'

readme-vars.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,8 @@ init_diagram: |
107107
"webcord:latest" <- Base Images
108108
# changelog
109109
changelogs:
110-
- {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."}
110+
- {date: "10.08.25:", desc: "Rebase to Debian Trixie."}
111+
- {date: "12.07.25:", desc: "Switch to Selkies base image, HTTPS IS NOW REQUIRED."}
111112
- {date: "03.04.25:", desc: "Update chromium launch options to improve performance."}
112113
- {date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon."}
113114
- {date: "06.01.24:", desc: "Rebase to Debian Bookworm."}

0 commit comments

Comments
 (0)