From f45d6f77eb5c5fad675becdb9cebfb75b0751565 Mon Sep 17 00:00:00 2001 From: Wyrrrd Date: Tue, 18 Jan 2022 22:06:09 +0100 Subject: [PATCH] Initial changes --- Dockerfile | 33 +++++++++++++++++++++----------- README.md | 55 ++++++++++++++++-------------------------------------- startup.sh | 7 ++++++- 3 files changed, 44 insertions(+), 51 deletions(-) diff --git a/Dockerfile b/Dockerfile index 58a6868..7ec7744 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,30 @@ -FROM ubuntu:trusty -MAINTAINER Sean Payne +FROM node AS builder +ARG WB_VERSION=1.4.0 -ENV DEBIAN_FRONTEND noninteractive +RUN cd /root && git clone https://github.com/neopostmodern/wohnungsbot --branch v$WB_VERSION && \ + cd wohnungsbot && npm i && cp app/constants/keys.json.example app/constants/keys.json && \ + npm run-script package-linux -ADD startup.sh /startup.sh + +FROM ubuntu:latest +ARG WB_VERSION=1.4.0 + +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update -y && \ - apt-get install -y git x11vnc wget python python-numpy unzip Xvfb firefox openbox geany menu && \ - cd /root && git clone https://github.com/kanaka/noVNC.git && \ - cd noVNC/utils && git clone https://github.com/kanaka/websockify websockify && \ - cd /root && \ - chmod 0755 /startup.sh && \ + apt-get install -y git x11vnc xvfb openbox libnss3 libgbm-dev libasound2 && \ apt-get autoclean && \ apt-get autoremove && \ rm -rf /var/lib/apt/lists/* -CMD /startup.sh -EXPOSE 6080 +RUN useradd -md /app -s /bin/bash bot +RUN cd /app && git clone https://github.com/kanaka/noVNC.git && \ + cd /app/noVNC/utils && git clone https://github.com/kanaka/websockify websockify && \ + mkdir /data && ln -s /app/.config/Wohnungsbot /data +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 + +ENTRYPOINT /app/startup.sh \ No newline at end of file diff --git a/README.md b/README.md index f0031a8..1e20970 100644 --- a/README.md +++ b/README.md @@ -1,54 +1,31 @@ -docker-novnc +docker-wohnungsbot ============ -This is a minimal image which will help you run X server with openbox on the docker container and access it from ANY recent browser without requiring you to do any configuration on the client side. +## This repository is still a draft, untested, do not use! - -## Use Cases - -1. Provide system application accessible over the web easily. Lets say you want to demo a software which runs on your pc over internet without requiring the clients to install any softwares like Teamviwer,etc. - -2. You can use this to create a simple use & throw linux envinronment with GUI over cloud or any VPS /Server or even at your laptop. - -Especially useful if you have to give access to your friends who come over for facebook/twittering at your PC. :) +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. ## How to use -``` -docker run -td -p 6080:6080 zerodivide1/docker-novnc -#Or if you like to build yourself -git clone https://github.com/zerodivide1/docker-novnc.git -cd docker-novnc -docker build -t novnc . -docker run -td -p 6080:6080 novnc +### Default use case +``` +docker build -t wohnungsbot https://github.com/Wyrrrd/docker-wohnungsbot.git +docker run -td -p 6080:6080 wohnungsbot ``` -Now visit +The interface is then available under http://privateip:6080 -http://kanaka.github.io/noVNC/noVNC/vnc.html -and enter +### Advanced use case -Host as your Public IP of your docker host/server. -Post = 6080 -Leave password as blank and click connect you should see a nice display within your browser, just right click and open terminal or firefox. - -For access within lan / localhost : visit http://localhost:6080 or http://privateip:6080 -if you are running it in a local docker host or lan ip . click connect. You are good to go. - - -## This is a minimal Image - -This comes only with Firefox & Geany text editor installed if you'd like to have more softwares you can freely install them using -apt-get commands - -ex: apt-get install libreoffice-base libreoffice-gtk libreoffice-calc - -## Support - -* http://docker.com for all the docker based support. +You can build a specific tag of [Wohnungsbot](https://github.com/neopostmodern/wohnungsbot) by using the following syntax. The data is generally automatically persisted in a docker volume, but that volume can also be named. +``` +docker build -t wohnungsbot --build-arg WG_VERSION=1.4.0 https://github.com/Wyrrrd/docker-wohnungsbot.git +docker run -td -p 6080:6080 -v wohnungsbot_data:/data wohnungsbot +``` ## Credits +* [Wohnungsbot](https://github.com/neopostmodern/wohnungsbot) * [NoVNC](http://kanaka.github.io/noVNC/) -* [Original docker-novnc project](https://github.com/paimpozhil/docker-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 05e4ea4..3aca72d 100644 --- a/startup.sh +++ b/startup.sh @@ -4,4 +4,9 @@ Xvfb :1 -screen 0 1600x900x16 & sleep 5 openbox-session& x11vnc -display :1 -nopw -listen localhost -xkb -ncache 10 -ncache_cr -forever & -cd /root/noVNC && ln -s vnc_auto.html index.html && ./utils/launch.sh --vnc localhost:5900 +cd /app/noVNC && ln -s vnc_auto.html index.html && ./utils/novnc_proxy --vnc localhost:5900 & + +while true +do + /app/Wohnungsbot.AppImage --appimage-extract-and-run --no-sandbox +done \ No newline at end of file