From 27bfa0087715073dbfde7bb2cbe540dfcbb16bfb Mon Sep 17 00:00:00 2001 From: thelamer Date: Sun, 19 Apr 2026 17:24:35 -0400 Subject: [PATCH] resolute rebase --- Dockerfile | 2 +- Jenkinsfile | 2 ++ README.md | 1 + jenkins-vars.yml | 1 + readme-vars.yml | 1 + 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index eae64d4..a6ae420 100644 --- a/Dockerfile +++ b/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 diff --git a/Jenkinsfile b/Jenkinsfile index 115902a..d57f609 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -35,6 +35,7 @@ pipeline { CI_PORT = '3001' CI_SSL = 'true' CI_DELAY = '120' + CI_WEB_SCREENSHOT_DELAY = '30' CI_DOCKERENV = 'TZ=US/Pacific' CI_AUTH = 'user:password' CI_WEBPATH = '' @@ -902,6 +903,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}\" \ diff --git a/README.md b/README.md index 97369cc..cfbdecc 100644 --- a/README.md +++ b/README.md @@ -639,6 +639,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.04.26:** - Rebase to resolute. * **29.03.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false. * **01.01.26:** - Add wayland init. * **25.11.25:** - Update project repo name. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 2c95c58..81c8399 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -30,6 +30,7 @@ repo_vars: - CI_PORT = '3001' - CI_SSL = 'true' - CI_DELAY = '120' + - CI_WEB_SCREENSHOT_DELAY = '30' - CI_DOCKERENV = 'TZ=US/Pacific' - CI_AUTH = 'user:password' - CI_WEBPATH = '' diff --git a/readme-vars.yml b/readme-vars.yml index 3266ada..3d98dc9 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -106,6 +106,7 @@ init_diagram: | "orcaslicer:latest" <- Base Images # changelog changelogs: + - {date: "19.04.26:", desc: "Rebase to resolute."} - {date: "29.03.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."} - {date: "01.01.26:", desc: "Add wayland init."} - {date: "25.11.25:", desc: "Update project repo name."}