diff --git a/Dockerfile b/Dockerfile index a91bde8..ac91fe2 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/Dockerfile.aarch64 b/Dockerfile.aarch64 index d67229d..1e2fc31 100644 --- a/Dockerfile.aarch64 +++ b/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 diff --git a/Jenkinsfile b/Jenkinsfile index 58558c4..42d203e 100644 --- a/Jenkinsfile +++ b/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}\" \ diff --git a/README.md b/README.md index f33aaf7..1397626 100644 --- a/README.md +++ b/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. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index ca24a39..7997dcd 100644 --- a/jenkins-vars.yml +++ b/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 = '' diff --git a/readme-vars.yml b/readme-vars.yml index 8cbf87a..bba238d 100644 --- a/readme-vars.yml +++ b/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."}