Merge pull request #20 from linuxserver/debain
Rebase to debian as Alpine chromium is currently not working inside docker
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
FROM ghcr.io/linuxserver/baseimage-kasmvnc:alpine318
|
FROM ghcr.io/linuxserver/baseimage-kasmvnc:debianbookworm
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
@@ -11,10 +11,15 @@ ENV TITLE=Chromium
|
|||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
apk add --no-cache \
|
apt-get update && \
|
||||||
|
apt-get install -y --no-install-recommends \
|
||||||
chromium && \
|
chromium && \
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
|
apt-get autoclean && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
|
/config/.cache \
|
||||||
|
/var/lib/apt/lists/* \
|
||||||
|
/var/tmp/* \
|
||||||
/tmp/*
|
/tmp/*
|
||||||
|
|
||||||
# add local files
|
# add local files
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-alpine318
|
FROM ghcr.io/linuxserver/baseimage-kasmvnc:arm64v8-debianbookworm
|
||||||
|
|
||||||
# set version label
|
# set version label
|
||||||
ARG BUILD_DATE
|
ARG BUILD_DATE
|
||||||
@@ -11,10 +11,15 @@ ENV TITLE=Chromium
|
|||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
echo "**** install packages ****" && \
|
echo "**** install packages ****" && \
|
||||||
apk add --no-cache \
|
apt-get update && \
|
||||||
|
apt-get install -y --no-install-recommends \
|
||||||
chromium && \
|
chromium && \
|
||||||
echo "**** cleanup ****" && \
|
echo "**** cleanup ****" && \
|
||||||
|
apt-get autoclean && \
|
||||||
rm -rf \
|
rm -rf \
|
||||||
|
/config/.cache \
|
||||||
|
/var/lib/apt/lists/* \
|
||||||
|
/var/tmp/* \
|
||||||
/tmp/*
|
/tmp/*
|
||||||
|
|
||||||
# add local files
|
# add local files
|
||||||
|
|||||||
2
Jenkinsfile
vendored
2
Jenkinsfile
vendored
@@ -23,7 +23,7 @@ pipeline {
|
|||||||
DOCKERHUB_IMAGE = 'linuxserver/chromium'
|
DOCKERHUB_IMAGE = 'linuxserver/chromium'
|
||||||
DEV_DOCKERHUB_IMAGE = 'lsiodev/chromium'
|
DEV_DOCKERHUB_IMAGE = 'lsiodev/chromium'
|
||||||
PR_DOCKERHUB_IMAGE = 'lspipepr/chromium'
|
PR_DOCKERHUB_IMAGE = 'lspipepr/chromium'
|
||||||
DIST_IMAGE = 'alpine'
|
DIST_IMAGE = 'ubuntu'
|
||||||
MULTIARCH = 'true'
|
MULTIARCH = 'true'
|
||||||
CI = 'true'
|
CI = 'true'
|
||||||
CI_WEB = 'true'
|
CI_WEB = 'true'
|
||||||
|
|||||||
@@ -329,6 +329,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
|
|||||||
|
|
||||||
## Versions
|
## Versions
|
||||||
|
|
||||||
|
* **13.05.23:** - Rebase to Debian Bookworm.
|
||||||
* **13.05.23:** - Rebase to Alpine 3.18.
|
* **13.05.23:** - Rebase to Alpine 3.18.
|
||||||
* **01.04.23:** - Preserve arguments passed to Chromium and restructure to use wrapper.
|
* **01.04.23:** - Preserve arguments passed to Chromium and restructure to use wrapper.
|
||||||
* **18.03.23:** - Initial release.
|
* **18.03.23:** - Initial release.
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ repo_vars:
|
|||||||
- DOCKERHUB_IMAGE = 'linuxserver/chromium'
|
- DOCKERHUB_IMAGE = 'linuxserver/chromium'
|
||||||
- DEV_DOCKERHUB_IMAGE = 'lsiodev/chromium'
|
- DEV_DOCKERHUB_IMAGE = 'lsiodev/chromium'
|
||||||
- PR_DOCKERHUB_IMAGE = 'lspipepr/chromium'
|
- PR_DOCKERHUB_IMAGE = 'lspipepr/chromium'
|
||||||
- DIST_IMAGE = 'alpine'
|
- DIST_IMAGE = 'ubuntu'
|
||||||
- MULTIARCH = 'true'
|
- MULTIARCH = 'true'
|
||||||
- CI = 'true'
|
- CI = 'true'
|
||||||
- CI_WEB = 'true'
|
- CI_WEB = 'true'
|
||||||
|
|||||||
@@ -76,6 +76,7 @@ app_setup_block: |
|
|||||||
|
|
||||||
# changelog
|
# changelog
|
||||||
changelogs:
|
changelogs:
|
||||||
|
- { date: "13.05.23:", desc: "Rebase to Debian Bookworm." }
|
||||||
- { date: "13.05.23:", desc: "Rebase to Alpine 3.18." }
|
- { 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: "01.04.23:", desc: "Preserve arguments passed to Chromium and restructure to use wrapper." }
|
||||||
- { date: "18.03.23:", desc: "Initial release." }
|
- { date: "18.03.23:", desc: "Initial release." }
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
chromium-browser ${CHROME_CLI}
|
wrapped-chromium ${CHROME_CLI}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
BIN=/usr/lib/chromium/chromium-launcher.sh
|
BIN=/usr/bin/chromium
|
||||||
|
|
||||||
# Run normally on privved containers or modified un non priv
|
# Run normally on privved containers or modified un non priv
|
||||||
if grep -q 'Seccomp:\t0' /proc/1/status; then
|
if grep -q 'Seccomp:\t0' /proc/1/status; then
|
||||||
Reference in New Issue
Block a user