From 700fa898c271f9eedf099ff9507bfd0603351146 Mon Sep 17 00:00:00 2001 From: Wyrrrd Date: Wed, 19 Jan 2022 10:54:54 +0100 Subject: [PATCH] Multiple little fixes - use novnc/novnc - add WORKDIR - fix symbolic link to userdata - fix rename vnc_auto --- Dockerfile | 6 ++++-- README.md | 6 ++---- startup.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7ec7744..d00b278 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,13 +18,15 @@ RUN apt-get update -y && \ rm -rf /var/lib/apt/lists/* RUN useradd -md /app -s /bin/bash bot -RUN cd /app && git clone https://github.com/kanaka/noVNC.git && \ +RUN cd /app && git clone https://github.com/novnc/noVNC.git && \ cd /app/noVNC/utils && git clone https://github.com/kanaka/websockify websockify && \ - mkdir /data && ln -s /app/.config/Wohnungsbot /data + mkdir /data && mkdir /app/.config && ln -s /data /app/.config/Wohnungsbot ADD startup.sh /app/startup.sh COPY --from=builder /root/wohnungsbot/release/Wohnungsbot-$WB_VERSION.AppImage /app/Wohnungsbot.AppImage 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 diff --git a/README.md b/README.md index 1e20970..8d94762 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,7 @@ docker-wohnungsbot ============ -## This repository is still a draft, untested, do not use! - -This repository packages [Wohnungsbot](https://github.com/neopostmodern/wohnungsbot) with [NoVNC](http://kanaka.github.io/noVNC/) to make to run in docker and still be able to interact with it for CAPTCHA solving. +This repository packages [Wohnungsbot](https://github.com/neopostmodern/wohnungsbot) with [NoVNC](https://github.com/novnc/NoVNC) to make to run in docker and still be able to interact with it for CAPTCHA solving. ## How to use @@ -27,5 +25,5 @@ docker run -td -p 6080:6080 -v wohnungsbot_data:/data wohnungsbot ## Credits * [Wohnungsbot](https://github.com/neopostmodern/wohnungsbot) -* [NoVNC](http://kanaka.github.io/noVNC/) +* [NoVNC](https://github.com/novnc/NoVNC) * [Original docker-novnc project](https://github.com/paimpozhil/docker-novnc) \ No newline at end of file diff --git a/startup.sh b/startup.sh index 3aca72d..ea99e3e 100644 --- a/startup.sh +++ b/startup.sh @@ -4,7 +4,7 @@ Xvfb :1 -screen 0 1600x900x16 & sleep 5 openbox-session& x11vnc -display :1 -nopw -listen localhost -xkb -ncache 10 -ncache_cr -forever & -cd /app/noVNC && ln -s vnc_auto.html index.html && ./utils/novnc_proxy --vnc localhost:5900 & +cd /app/noVNC && ln -s vnc_lite.html index.html && ./utils/novnc_proxy --vnc localhost:5900 & while true do