From e174d9dcd6e5eb3207bc493e0431623f4ba43d01 Mon Sep 17 00:00:00 2001 From: thelamer Date: Sat, 20 Jun 2026 14:55:03 -0400 Subject: [PATCH] rebase to debian trixie and make wayland default --- .github/workflows/external_trigger.yml | 2 +- Dockerfile | 7 ++++--- README.md | 1 + jenkins-vars.yml | 2 +- readme-vars.yml | 1 + 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/external_trigger.yml b/.github/workflows/external_trigger.yml index 8fe08b1..a8a5192 100644 --- a/.github/workflows/external_trigger.yml +++ b/.github/workflows/external_trigger.yml @@ -110,7 +110,7 @@ jobs: echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY exit 0 else - if curl -IfSsL "https://downloads.scummvm.org/frs/scummvm/$(echo ${EXT_RELEASE}| sed 's/^v//g')/scummvm_$(echo ${EXT_RELEASE}| sed 's/^v//g')-1_ubuntu24_04_amd64.deb" > /dev/null 2>&1; then + if curl -IfSsL "https://downloads.scummvm.org/frs/scummvm/$(echo ${EXT_RELEASE}| sed 's/^v//g')/scummvm_$(echo ${EXT_RELEASE}| sed 's/^v//g')-1_debian13_amd64.deb" > /dev/null 2>&1; then artifacts_found="true" else artifacts_found="false" diff --git a/Dockerfile b/Dockerfile index 1d1bbac..15039c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble +FROM ghcr.io/linuxserver/baseimage-selkies:debiantrixie # set version label ARG BUILD_DATE @@ -9,7 +9,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="thelamer" # title -ENV TITLE=ScummVM +ENV TITLE=ScummVM \ + PIXELFLUX_WAYLAND=true RUN \ echo "**** add icon ****" && \ @@ -23,7 +24,7 @@ RUN \ fi && \ curl -o \ /tmp/scummvm.deb -L \ - "https://downloads.scummvm.org/frs/scummvm/$(echo ${SCUMMVM_VERSION} | sed 's/^v//g')/scummvm_$(echo ${SCUMMVM_VERSION} | sed 's/^v//g')-1_ubuntu24_04_amd64.deb" && \ + "https://downloads.scummvm.org/frs/scummvm/$(echo ${SCUMMVM_VERSION} | sed 's/^v//g')/scummvm_$(echo ${SCUMMVM_VERSION} | sed 's/^v//g')-1_debian13_amd64.deb" && \ apt-get update && \ apt-get install -y \ /tmp/scummvm.deb && \ diff --git a/README.md b/README.md index 3b85f6c..bc942ca 100644 --- a/README.md +++ b/README.md @@ -646,5 +646,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **20.06.26:** - Rebase to Debian Trixie, make Wayland default disable with PIXELFLUX_WAYLAND=false. * **13.01.26:** - Rebase to Ubuntu Noble, add wayland init. * **25.08.25:** - Initial release. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index b7a01ce..bae8fe2 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -4,7 +4,7 @@ project_name: docker-scummvm external_type: github_stable external_artifact_check: | - if curl -IfSsL "https://downloads.scummvm.org/frs/scummvm/$(echo ${EXT_RELEASE}| sed 's/^v//g')/scummvm_$(echo ${EXT_RELEASE}| sed 's/^v//g')-1_ubuntu24_04_amd64.deb" > /dev/null 2>&1; then + if curl -IfSsL "https://downloads.scummvm.org/frs/scummvm/$(echo ${EXT_RELEASE}| sed 's/^v//g')/scummvm_$(echo ${EXT_RELEASE}| sed 's/^v//g')-1_debian13_amd64.deb" > /dev/null 2>&1; then artifacts_found="true" else artifacts_found="false" diff --git a/readme-vars.yml b/readme-vars.yml index b021e2f..0cd7173 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -113,5 +113,6 @@ init_diagram: | "scummvm:latest" <- Base Images # changelog changelogs: + - {date: "20.06.26:", desc: "Rebase to Debian Trixie, make Wayland default disable with PIXELFLUX_WAYLAND=false."} - {date: "13.01.26:", desc: "Rebase to Ubuntu Noble, add wayland init."} - {date: "25.08.25:", desc: "Initial release."}