Skip to content

Commit 57c5384

Browse files
committed
rebase to resolute
1 parent aa4cf0e commit 57c5384

6 files changed

Lines changed: 9 additions & 14 deletions

File tree

Dockerfile

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
3+
FROM ghcr.io/linuxserver/baseimage-selkies:ubunturesolute
44

55
# set version label
66
ARG BUILD_DATE
@@ -20,12 +20,7 @@ RUN \
2020
/usr/share/selkies/www/icon.png \
2121
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/firefox-logo.png && \
2222
echo "**** install packages ****" && \
23-
apt-key adv \
24-
--keyserver hkp://keyserver.ubuntu.com:80 \
25-
--recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \
26-
echo \
27-
"deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \
28-
/etc/apt/sources.list.d/xtradeb.list && \
23+
add-apt-repository ppa:xtradeb/apps && \
2924
apt-get update && \
3025
apt-get install -y --no-install-recommends \
3126
firefox \

Dockerfile.aarch64

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# syntax=docker/dockerfile:1
22

3-
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubuntunoble
3+
FROM ghcr.io/linuxserver/baseimage-selkies:arm64v8-ubunturesolute
44

55
# set version label
66
ARG BUILD_DATE
@@ -20,12 +20,7 @@ RUN \
2020
/usr/share/selkies/www/icon.png \
2121
https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/firefox-logo.png && \
2222
echo "**** install packages ****" && \
23-
apt-key adv \
24-
--keyserver hkp://keyserver.ubuntu.com:80 \
25-
--recv-keys 5301FA4FD93244FBC6F6149982BB6851C64F6880 && \
26-
echo \
27-
"deb https://ppa.launchpadcontent.net/xtradeb/apps/ubuntu noble main" > \
28-
/etc/apt/sources.list.d/xtradeb.list && \
23+
add-apt-repository ppa:xtradeb/apps && \
2924
apt-get update && \
3025
apt-get install -y --no-install-recommends \
3126
firefox \

Jenkinsfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ pipeline {
3333
CI_PORT = '3001'
3434
CI_SSL = 'true'
3535
CI_DELAY = '120'
36+
CI_WEB_SCREENSHOT_DELAY = '30'
3637
CI_DOCKERENV = 'TZ=US/Pacific'
3738
CI_AUTH = 'user:password'
3839
CI_WEBPATH = ''
@@ -893,6 +894,7 @@ pipeline {
893894
--shm-size=1gb \
894895
-v /var/run/docker.sock:/var/run/docker.sock \
895896
-e IMAGE=\"${IMAGE}\" \
897+
-e WEB_SCREENSHOT_DELAY=\"${CI_WEB_SCREENSHOT_DELAY}\" \
896898
-e DOCKER_LOGS_TIMEOUT=\"${CI_DELAY}\" \
897899
-e TAGS=\"${CI_TAGS}\" \
898900
-e META_TAG=\"${META_TAG}\" \

README.md

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

652652
## Versions
653653

654+
* **19.04.26:** - Rebase to resolute.
654655
* **31.03.26:** - Make Wayland default disable with PIXELFLUX_WAYLAND=false.
655656
* **20.12.25:** - Add Wayland init logic.
656657
* **26.08.25:** - Suppress sandbox security warning as it's misleading inside a container.

jenkins-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ repo_vars:
2222
- CI_PORT = '3001'
2323
- CI_SSL = 'true'
2424
- CI_DELAY = '120'
25+
- CI_WEB_SCREENSHOT_DELAY = '30'
2526
- CI_DOCKERENV = 'TZ=US/Pacific'
2627
- CI_AUTH = 'user:password'
2728
- CI_WEBPATH = ''

readme-vars.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,7 @@ init_diagram: |
114114
"firefox:latest" <- Base Images
115115
# changelog
116116
changelogs:
117+
- {date: "19.04.26:", desc: "Rebase to resolute."}
117118
- {date: "31.03.26:", desc: "Make Wayland default disable with PIXELFLUX_WAYLAND=false."}
118119
- {date: "20.12.25:", desc: "Add Wayland init logic."}
119120
- {date: "26.08.25:", desc: "Suppress sandbox security warning as it's misleading inside a container."}

0 commit comments

Comments
 (0)