Merge pull request #11 from linuxserver/resolute

rebase to resolute

Author: aptalca

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:ubunturesolute
 
 # set version label
 ARG BUILD_DATE

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubuntunoble
+FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubunturesolute
 
 # set version label
 ARG BUILD_DATE

Jenkinsfile

@@ -33,6 +33,7 @@ pipeline {
     CI_PORT = '3001'
     CI_SSL = 'true'
     CI_DELAY = '120'
+    CI_WEB_SCREENSHOT_DELAY = '30'
     CI_DOCKERENV = ''
     CI_AUTH = ''
     CI_WEBPATH = ''
@@ -893,6 +894,7 @@ pipeline {
                 --shm-size=1gb \
                 -v /var/run/docker.sock:/var/run/docker.sock \
                 -e IMAGE=\"${IMAGE}\" \
+                -e WEB_SCREENSHOT_DELAY=\"${CI_WEB_SCREENSHOT_DELAY}\" \
                 -e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
                 -e TAGS=\"${CI_TAGS}\" \
                 -e META_TAG=\"${META_TAG}\" \

README.md

@@ -576,6 +576,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **20.04.26:** - Rebase to resolute.
 * **04.04.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
 * **11.03.26:** - Push aarch64 image. Update external trigger.
 * **28.12.25:** - Add Wayland init logic.

jenkins-vars.yml

@@ -29,6 +29,7 @@ repo_vars:
   - CI_PORT = '3001'
   - CI_SSL = 'true'
   - CI_DELAY = '120'
+  - CI_WEB_SCREENSHOT_DELAY = '30'
   - CI_DOCKERENV = ''
   - CI_AUTH = ''
   - CI_WEBPATH = ''

readme-vars.yml

@@ -101,6 +101,7 @@ init_diagram: |
   "yaak:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "20.04.26:", desc: "Rebase to resolute."}
   - {date: "04.04.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
   - {date: "11.03.26:", desc: "Push aarch64 image. Update external trigger."}
   - {date: "28.12.25:", desc: "Add Wayland init logic."}