diff --git a/Dockerfile b/Dockerfile index 16552c8..53a6068 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-selkies:debianbookworm +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-selkies:debiantrixie # set version label ARG BUILD_DATE @@ -34,7 +36,8 @@ RUN \ echo "**** application tweaks ****" && \ mv \ /usr/bin/webcord \ - /usr/bin/webcord-real && \ + /usr/bin/webcord-real && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0f11c81..c7737a5 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,6 @@ -FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-debianbookworm +# syntax=docker/dockerfile:1 + +FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-debiantrixie # set version label ARG BUILD_DATE @@ -34,7 +36,8 @@ RUN \ echo "**** application tweaks ****" && \ mv \ /usr/bin/webcord \ - /usr/bin/webcord-real && \ + /usr/bin/webcord-real && \ + printf "Linuxserver.io version: ${VERSION}\nBuild-date: ${BUILD_DATE}" > /build_version && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Jenkinsfile b/Jenkinsfile index 7c8b2e4..6cb532e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { DOCKERHUB_IMAGE = 'linuxserver/webcord' DEV_DOCKERHUB_IMAGE = 'lsiodev/webcord' PR_DOCKERHUB_IMAGE = 'lspipepr/webcord' - DIST_IMAGE = 'ubuntu' + DIST_IMAGE = 'debian' MULTIARCH = 'true' CI = 'true' CI_WEB = 'true' diff --git a/README.md b/README.md index 20b69a4..e18a9d0 100644 --- a/README.md +++ b/README.md @@ -428,7 +428,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED. +* **10.08.25:** - Rebase to Debian Trixie. +* **12.07.25:** - Switch to Selkies base image, HTTPS IS NOW REQUIRED. * **03.04.25:** - Update chromium launch options to improve performance. * **10.02.24:** - Update Readme with new env vars and ingest proper PWA icon. * **06.01.24:** - Rebase to Debian Bookworm. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 07a9630..5925b76 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -6,7 +6,6 @@ external_type: github_stable release_type: stable release_tag: latest ls_branch: master -build_armhf: false repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'SpacingBat3' @@ -18,7 +17,7 @@ repo_vars: - DOCKERHUB_IMAGE = 'linuxserver/webcord' - DEV_DOCKERHUB_IMAGE = 'lsiodev/webcord' - PR_DOCKERHUB_IMAGE = 'lspipepr/webcord' - - DIST_IMAGE = 'ubuntu' + - DIST_IMAGE = 'debian' - MULTIARCH = 'true' - CI = 'true' - CI_WEB = 'true' diff --git a/readme-vars.yml b/readme-vars.yml index d6edbe9..8df76d7 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -107,7 +107,8 @@ init_diagram: | "webcord:latest" <- Base Images # changelog changelogs: - - {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."} + - {date: "10.08.25:", desc: "Rebase to Debian Trixie."} + - {date: "12.07.25:", desc: "Switch to Selkies base image, HTTPS IS NOW REQUIRED."} - {date: "03.04.25:", desc: "Update chromium launch options to improve performance."} - {date: "10.02.24:", desc: "Update Readme with new env vars and ingest proper PWA icon."} - {date: "06.01.24:", desc: "Rebase to Debian Bookworm."}