LAB-linuxserver/docker-webtop
1
0
Fork 0
mirror of https://github.com/linuxserver/docker-webtop.git synced 2026-03-16 00:00:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

rebase openbox to jammy (#89)

Browse Source 
* rebase openbox to jammy

* Use s6v3 openbox copy

Co-authored-by: ryan.kuba <ryan.kuba@kasmweb.com>
Co-authored-by: TheSpad <git@spad.co.uk>
This commit is contained in:
Ryan Kuba 2022-10-27 07:41:47 -07:00 committed by GitHub
parent 48c856d616
commit d62df9b642
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:focal
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:jammy
# set version label
ARG BUILD_DATE
@ -6,8 +6,12 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"
# prevent Ubuntu's firefox stub from being installed
COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
RUN \
echo "**** install packages ****" && \
add-apt-repository -y ppa:mozillateam/ppa && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends -y \

6
Dockerfile.aarch64
View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-focal
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm64v8-jammy
# set version label
ARG BUILD_DATE
@ -6,8 +6,12 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"
# prevent Ubuntu's firefox stub from being installed
COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
RUN \
echo "**** install packages ****" && \
add-apt-repository -y ppa:mozillateam/ppa && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends -y \

6
Dockerfile.armhf
View File

@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-focal
FROM ghcr.io/linuxserver/baseimage-rdesktop-web:arm32v7-jammy
# set version label
ARG BUILD_DATE
@ -6,8 +6,12 @@ ARG VERSION
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
LABEL maintainer="thelamer"
# prevent Ubuntu's firefox stub from being installed
COPY /root/etc/apt/preferences.d/firefox-no-snap /etc/apt/preferences.d/firefox-no-snap
RUN \
echo "**** install packages ****" && \
add-apt-repository -y ppa:mozillateam/ppa && \
apt-get update && \
DEBIAN_FRONTEND=noninteractive \
apt-get install --no-install-recommends -y \

3
root/etc/apt/preferences.d/firefox-no-snap Normal file
View File

@ -0,0 +1,3 @@
Package: firefox*
Pin: release o=Ubuntu*
Pin-Priority: -1

0
root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy Normal file
View File

0
root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-config Normal file
View File

3
root/etc/cont-init.d/56-openboxcopy → root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run Normal file → Executable file
View File

@ -1,7 +1,8 @@
#!/usr/bin/with-contenv bash
# default file copies first run
[[ ! -f /config/.config/openbox/menu.xml ]] && \
if [[ ! -f /config/.config/openbox/menu.xml ]]; then
mkdir -p /config/.config/openbox && \
cp /defaults/menu.xml /config/.config/openbox/menu.xml && \
chown -R abc:abc /config/.config
fi

1
root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type Normal file
View File

@ -0,0 +1 @@
oneshot

1
root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up Normal file
View File

@ -0,0 +1 @@
/etc/s6-overlay/s6-rc.d/init-openboxcopy/run

0
root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy Normal file
View File