diff --git a/Dockerfile b/Dockerfile index 0a66bf8..5a969d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,22 +12,25 @@ ARG WB_VERSION=1.4.0 ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && \ - apt-get install -y git x11vnc xvfb openbox libnss3 libgbm-dev libasound2 && \ + apt-get install -y git x11vnc xvfb openbox hsetroot libnss3 libgbm-dev libasound2 && \ apt-get autoclean && \ apt-get autoremove && \ rm -rf /var/lib/apt/lists/* RUN useradd -md /app -s /bin/bash bot RUN cd /app && git clone https://github.com/novnc/noVNC.git && \ - cd /app/noVNC/utils && git clone https://github.com/kanaka/websockify websockify && \ + cd noVNC/ && cp vnc_lite.html index.html && sed -i -e 's/noVNC<\/title>/<title>Wohnungsbot<\/title>\n\n <link rel="icon" type="image\/x-icon" href="favicon.ico">/' -e "s/document\.getElementById('sendCtrlAltDelButton')//" -e 's/\.onclick = sendCtrlAltDel\;//' -e 's/<div id="sendCtrlAltDelButton">Send CtrlAltDel<\/div>//' index.html && \ + cd utils && git clone https://github.com/kanaka/websockify websockify && \ mkdir /data && mkdir /app/.config && ln -s /data /app/.config/Wohnungsbot ADD startup.sh /app/startup.sh ADD openbox/* /app/.config/openbox/ COPY --from=builder /root/wohnungsbot/release/Wohnungsbot-$WB_VERSION.AppImage /app/Wohnungsbot.AppImage +COPY --from=builder /root/wohnungsbot/resources/icon.ico /app/noVNC/favicon.ico +COPY --from=builder /root/wohnungsbot/resources/icons/512x512.png /app/background.png RUN chmod 0755 /app/startup.sh && chown -R bot /app && chown -R bot /data VOLUME /data USER bot WORKDIR /app -ENTRYPOINT /app/startup.sh \ No newline at end of file +ENTRYPOINT /app/startup.sh diff --git a/openbox/autostart b/openbox/autostart index b35e53d..4ea30af 100644 --- a/openbox/autostart +++ b/openbox/autostart @@ -1,2 +1,3 @@ # Programs that will run after Openbox has started -~/Wohnungsbot.AppImage --appimage-extract-and-run --no-sandbox \ No newline at end of file +hsetroot -center ~/background.png & +~/Wohnungsbot.AppImage --appimage-extract-and-run --no-sandbox diff --git a/startup.sh b/startup.sh index 48828ad..a565cff 100644 --- a/startup.sh +++ b/startup.sh @@ -4,4 +4,4 @@ Xvfb :1 -screen 0 1600x900x16 & sleep 5 openbox-session& x11vnc -display :1 -nopw -listen localhost -xkb -forever & -cd /app/noVNC && ln -s vnc_lite.html index.html && ./utils/novnc_proxy --vnc localhost:5900 \ No newline at end of file +cd /app/noVNC && ./utils/novnc_proxy --vnc localhost:5900