From d283bec0069a4dd6d9da275654ad8824a240426f Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 29 Dec 2023 13:44:35 -0800 Subject: [PATCH 1/2] Rebase to debian as Alpine chromium is currently not working inside docker --- Dockerfile | 9 +++++++-- Dockerfile.aarch64 | 9 +++++++-- README.md | 1 + readme-vars.yml | 1 + root/defaults/autostart | 2 +- root/usr/bin/{chromium-browser => wrapped-chromium} | 2 +- 6 files changed, 18 insertions(+), 6 deletions(-) rename root/usr/bin/{chromium-browser => wrapped-chromium} (93%) diff --git a/Dockerfile b/Dockerfile index 14364f2..8b9d583 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine318 +FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm # set version label ARG BUILD_DATE @@ -11,10 +11,15 @@ ENV TITLE=Chromium RUN \ echo "**** install packages ****" && \ - apk add --no-cache \ + apt-get update && \ + apt-get install -y --no-install-recommends \ chromium && \ echo "**** cleanup ****" && \ + apt-get autoclean && \ rm -rf \ + /config/.cache \ + /var/lib/apt/lists/* \ + /var/tmp/* \ /tmp/* # add local files diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index b850a35..779d563 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,4 +1,4 @@ -FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine318 +FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm # set version label ARG BUILD_DATE @@ -11,10 +11,15 @@ ENV TITLE=Chromium RUN \ echo "**** install packages ****" && \ - apk add --no-cache \ + apt-get update && \ + apt-get install -y --no-install-recommends \ chromium && \ echo "**** cleanup ****" && \ + apt-get autoclean && \ rm -rf \ + /config/.cache \ + /var/lib/apt/lists/* \ + /var/tmp/* \ /tmp/* # add local files diff --git a/README.md b/README.md index 02f68d8..17f6e29 100644 --- a/README.md +++ b/README.md @@ -329,6 +329,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **13.05.23:** - Rebase to Debian Bookworm. * **13.05.23:** - Rebase to Alpine 3.18. * **01.04.23:** - Preserve arguments passed to Chromium and restructure to use wrapper. * **18.03.23:** - Initial release. diff --git a/readme-vars.yml b/readme-vars.yml index 1f9dc53..a2975e3 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -76,6 +76,7 @@ app_setup_block: | # changelog changelogs: + - { date: "13.05.23:", desc: "Rebase to Debian Bookworm." } - { date: "13.05.23:", desc: "Rebase to Alpine 3.18." } - { date: "01.04.23:", desc: "Preserve arguments passed to Chromium and restructure to use wrapper." } - { date: "18.03.23:", desc: "Initial release." } diff --git a/root/defaults/autostart b/root/defaults/autostart index 365786c..8ff75b9 100644 --- a/root/defaults/autostart +++ b/root/defaults/autostart @@ -1,2 +1,2 @@ #!/bin/bash -chromium-browser ${CHROME_CLI} +wrapped-chromium ${CHROME_CLI} diff --git a/root/usr/bin/chromium-browser b/root/usr/bin/wrapped-chromium similarity index 93% rename from root/usr/bin/chromium-browser rename to root/usr/bin/wrapped-chromium index 2da0997..010d01d 100755 --- a/root/usr/bin/chromium-browser +++ b/root/usr/bin/wrapped-chromium @@ -1,6 +1,6 @@ #!/bin/bash -BIN=/usr/lib/chromium/chromium-launcher.sh +BIN=/usr/bin/chromium # Run normally on privved containers or modified un non priv if grep -q 'Seccomp:\t0' /proc/1/status; then From 8b9f00a8ac724854eab0dc9fea90f973a439778f Mon Sep 17 00:00:00 2001 From: thelamer Date: Fri, 29 Dec 2023 22:28:16 -0800 Subject: [PATCH 2/2] update that this is a debian based image for package info --- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 40177f4..2f78464 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ pipeline { DOCKERHUB_IMAGE = 'linuxserver/chromium' DEV_DOCKERHUB_IMAGE = 'lsiodev/chromium' PR_DOCKERHUB_IMAGE = 'lspipepr/chromium' - DIST_IMAGE = 'alpine' + DIST_IMAGE = 'ubuntu' MULTIARCH = 'true' CI = 'true' CI_WEB = 'true' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index a8f9f87..1d25798 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -15,7 +15,7 @@ repo_vars: - DOCKERHUB_IMAGE = 'linuxserver/chromium' - DEV_DOCKERHUB_IMAGE = 'lsiodev/chromium' - PR_DOCKERHUB_IMAGE = 'lspipepr/chromium' - - DIST_IMAGE = 'alpine' + - DIST_IMAGE = 'ubuntu' - MULTIARCH = 'true' - CI = 'true' - CI_WEB = 'true'