diff --git a/Dockerfile b/Dockerfile index fd14264..6b4df61 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 318327b..534256d 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 cfd0d15..e3d54f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -33,6 +33,7 @@ pipeline { CI_PORT = '3001' CI_SSL = 'true' CI_DOCKER_LOGS_TIMEOUT = '240' + 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_DOCKER_LOGS_TIMEOUT}\" \ -e TAGS=\"${CI_TAGS}\" \ -e META_TAG=\"${META_TAG}\" \ diff --git a/README.md b/README.md index 1886644..259f143 100644 --- a/README.md +++ b/README.md @@ -58,9 +58,11 @@ The architectures supported by this image are: The application can be accessed at: -* http://yourhost:3000/ * https://yourhost:3001/ +>[!NOTE] +>The arm64 version of this container ingests its version from the Ubuntu repositories, it is pinned at that version while the amd64 version will always be up to date. + ### Strict reverse proxies This image uses a self-signed certificate by default. This naturally means the scheme is `https`. @@ -640,6 +642,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. * **27.12.25:** - Add wayland init logic. * **12.07.25:** - Rebase to Selkies, HTTPS IS NOW REQUIRED. diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 925d800..cfb827e 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -30,6 +30,7 @@ repo_vars: - CI_PORT = '3001' - CI_SSL = 'true' - CI_DOCKER_LOGS_TIMEOUT = '240' + - CI_WEB_SCREENSHOT_DELAY = '30' - CI_DOCKERENV = '' - CI_AUTH = '' - CI_WEBPATH = '' diff --git a/readme-vars.yml b/readme-vars.yml index 85af345..1a11817 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -34,8 +34,11 @@ app_setup_block_enabled: true app_setup_block: | The application can be accessed at: - * http://yourhost:3000/ * https://yourhost:3001/ + + >[!NOTE] + >The arm64 version of this container ingests its version from the Ubuntu repositories, it is pinned at that version while the amd64 version will always be up to date. + # init diagram init_diagram: | "blender:latest": { @@ -108,6 +111,7 @@ init_diagram: | "blender: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: "27.12.25:", desc: "Add wayland init logic."} - {date: "12.07.25:", desc: "Rebase to Selkies, HTTPS IS NOW REQUIRED."}