From d62df9b642c6a159f3d8e7a3d991d3dd342e3453 Mon Sep 17 00:00:00 2001 From: Ryan Kuba Date: Thu, 27 Oct 2022 07:41:47 -0700 Subject: [PATCH] rebase openbox to jammy (#89) * rebase openbox to jammy * Use s6v3 openbox copy Co-authored-by: ryan.kuba Co-authored-by: TheSpad --- Dockerfile | 6 +++++- Dockerfile.aarch64 | 6 +++++- Dockerfile.armhf | 6 +++++- root/etc/apt/preferences.d/firefox-no-snap | 3 +++ .../s6-rc.d/init-config-end/dependencies.d/init-openboxcopy | 0 .../s6-rc.d/init-openboxcopy/dependencies.d/init-config | 0 .../s6-rc.d/init-openboxcopy/run} | 3 ++- root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type | 1 + root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up | 1 + .../etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy | 0 10 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 root/etc/apt/preferences.d/firefox-no-snap create mode 100644 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy create mode 100644 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-config rename root/etc/{cont-init.d/56-openboxcopy => s6-overlay/s6-rc.d/init-openboxcopy/run} (78%) mode change 100644 => 100755 create mode 100644 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type create mode 100644 root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up create mode 100644 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy diff --git a/Dockerfile b/Dockerfile index 1d6fc27d..3636e8ec 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 83bd8c6c..9e27aef3 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -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 \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 46b3b48d..232311e4 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -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 \ diff --git a/root/etc/apt/preferences.d/firefox-no-snap b/root/etc/apt/preferences.d/firefox-no-snap new file mode 100644 index 00000000..9406bcc0 --- /dev/null +++ b/root/etc/apt/preferences.d/firefox-no-snap @@ -0,0 +1,3 @@ +Package: firefox* +Pin: release o=Ubuntu* +Pin-Priority: -1 diff --git a/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy b/root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-openboxcopy new file mode 100644 index 00000000..e69de29b diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-config b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/dependencies.d/init-config new file mode 100644 index 00000000..e69de29b diff --git a/root/etc/cont-init.d/56-openboxcopy b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run old mode 100644 new mode 100755 similarity index 78% rename from root/etc/cont-init.d/56-openboxcopy rename to root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run index f22df658..e7504d57 --- a/root/etc/cont-init.d/56-openboxcopy +++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/run @@ -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 diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type new file mode 100644 index 00000000..3d92b15f --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/type @@ -0,0 +1 @@ +oneshot \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up new file mode 100644 index 00000000..c5a506fb --- /dev/null +++ b/root/etc/s6-overlay/s6-rc.d/init-openboxcopy/up @@ -0,0 +1 @@ +/etc/s6-overlay/s6-rc.d/init-openboxcopy/run \ No newline at end of file diff --git a/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy b/root/etc/s6-overlay/s6-rc.d/user/contents.d/init-openboxcopy new file mode 100644 index 00000000..e69de29b