Skip to content

Commit e174d9d

Browse files
committed
rebase to debian trixie and make wayland default
1 parent 87b46c9 commit e174d9d

5 files changed

Lines changed: 8 additions & 5 deletions

File tree

.github/workflows/external_trigger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
echo "New version \`${EXT_RELEASE}\` found; but there already seems to be an active build on Jenkins; exiting" >> $GITHUB_STEP_SUMMARY
111111
exit 0
112112
else
113-
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
113+
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
114114
artifacts_found="true"
115115
else
116116
artifacts_found="false"

Dockerfile

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

44
# set version label
55
ARG BUILD_DATE
@@ -9,7 +9,8 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
99
LABEL maintainer="thelamer"
1010

1111
# title
12-
ENV TITLE=ScummVM
12+
ENV TITLE=ScummVM \
13+
PIXELFLUX_WAYLAND=true
1314

1415
RUN \
1516
echo "**** add icon ****" && \
@@ -23,7 +24,7 @@ RUN \
2324
fi && \
2425
curl -o \
2526
/tmp/scummvm.deb -L \
26-
"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" && \
27+
"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" && \
2728
apt-get update && \
2829
apt-get install -y \
2930
/tmp/scummvm.deb && \

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -646,5 +646,6 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
646646

647647
## Versions
648648

649+
* **20.06.26:** - Rebase to Debian Trixie, make Wayland default disable with PIXELFLUX_WAYLAND=false.
649650
* **13.01.26:** - Rebase to Ubuntu Noble, add wayland init.
650651
* **25.08.25:** - Initial release.

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-scummvm
55
external_type: github_stable
66
external_artifact_check: |
7-
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
7+
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
88
artifacts_found="true"
99
else
1010
artifacts_found="false"

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,5 +113,6 @@ init_diagram: |
113113
"scummvm:latest" <- Base Images
114114
# changelog
115115
changelogs:
116+
- {date: "20.06.26:", desc: "Rebase to Debian Trixie, make Wayland default disable with PIXELFLUX_WAYLAND=false."}
116117
- {date: "13.01.26:", desc: "Rebase to Ubuntu Noble, add wayland init."}
117118
- {date: "25.08.25:", desc: "Initial release."}

0 commit comments

Comments
 (0)