From c749c5dbaab1128717380de213e2572aa85eb853 Mon Sep 17 00:00:00 2001 From: Martin Lehmann Date: Fri, 11 Oct 2024 14:28:20 +0200 Subject: [PATCH] chore: Remove nitrogen from remote docker image It hasn't been working for a while anyways. (This might have to do with the wallpaper file being empty.) --- capella/autostart | 2 -- docs/docs/remote.md | 2 -- remote/Dockerfile | 6 +----- remote/bg-saved.cfg | 7 ------- remote/wallpaper.png | 0 5 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 remote/bg-saved.cfg delete mode 100644 remote/wallpaper.png diff --git a/capella/autostart b/capella/autostart index 2f72c7f6..16e2fff0 100755 --- a/capella/autostart +++ b/capella/autostart @@ -11,8 +11,6 @@ source /etc/environment # Turn off bell sound (loud beep) xset b off -nitrogen --restore & - if [ "$AUTOSTART_CAPELLA" = "1" ]; then if [ "$RESTART_CAPELLA" = "1" ]; diff --git a/docs/docs/remote.md b/docs/docs/remote.md index 80063a73..7908c991 100644 --- a/docs/docs/remote.md +++ b/docs/docs/remote.md @@ -27,8 +27,6 @@ It is a basic Linux server with a [Openbox](http://openbox.org/) installation. Feel free to adjust the configurations `remote/rc.xml` and `remote/menu.xml` to satisfy custom Openbox configuration needs. -If you like to use your own wallpaper, replace `remote/wallpaper.png`. - ### Build it manually with Docker ```zsh diff --git a/remote/Dockerfile b/remote/Dockerfile index 57727c53..7a132f89 100644 --- a/remote/Dockerfile +++ b/remote/Dockerfile @@ -27,7 +27,7 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y --no-install-reco obconf \ gettext-base \ xprintidle \ - nitrogen && rm -rf /var/lib/apt/lists/* + && rm -rf /var/lib/apt/lists/* ARG XPRA_REGISTRY=https://xpra.org @@ -48,10 +48,6 @@ RUN wget -qO /usr/share/keyrings/xpra.asc ${XPRA_REGISTRY}/xpra.asc && \ COPY rc.xml /etc/xdg/openbox/rc.xml COPY menu.xml /etc/xdg/openbox/menu.xml -# Setup Nitrogen (Desktop background) -COPY wallpaper.png /tmp/wallpaper.png -COPY bg-saved.cfg /home/techuser/.config/nitrogen/bg-saved.cfg - # Copy Supervisor Configuration RUN pip install --no-cache-dir supervisor==4.2.5 COPY supervisord.conf /etc/supervisord.conf diff --git a/remote/bg-saved.cfg b/remote/bg-saved.cfg deleted file mode 100644 index 72f2f872..00000000 --- a/remote/bg-saved.cfg +++ /dev/null @@ -1,7 +0,0 @@ -# SPDX-FileCopyrightText: Copyright DB InfraGO AG and contributors -# SPDX-License-Identifier: Apache-2.0 - -[xin_-1] -file=/tmp/wallpaper.png -mode=4 -bgcolor=#000000 diff --git a/remote/wallpaper.png b/remote/wallpaper.png deleted file mode 100644 index e69de29b..00000000