From ae8c952cf685b2557e0fa823bce5204366ad8deb Mon Sep 17 00:00:00 2001 From: Simon Li Date: Thu, 26 Sep 2019 18:58:53 +0100 Subject: [PATCH] Add comments to Dockerfile about hacks --- Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 748f873..153637c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,22 +10,23 @@ RUN apt-get update -y -q && \ tigervnc-standalone-server RUN apt-get install -y -q python-pip -# https://github.com/novnc/noVNC/issues/1276 +# Force an upgrade https://github.com/novnc/noVNC/issues/1276 RUN /usr/bin/pip install -U websockify==0.9.0 +# pip doesn't rebuild rebind.so though so use the old version +RUN ln -s /usr/lib/websockify/rebind.so /usr/local/lib/ +# Patch novnc to automatically connect ADD websocket-path-ui-js.patch /usr/share/novnc/include RUN cd /usr/share/novnc/include/ && \ patch -p0 < websocket-path-ui-js.patch -RUN ln -s /usr/lib/websockify/rebind.so /usr/local/lib/ - USER jovyan -# RUN /opt/conda/bin/pip install jupyter-server-proxy +# Custom jupyter-server-proxy to load vnc.html instead of / RUN /opt/conda/bin/pip install https://github.com/manics/jupyter-server-proxy/archive/indexpage.zip ADD jupyter_notebook_config.py /home/jovyan/.jupyter/ # websockify --web /usr/share/novnc 5901 -- vncserver -verbose -xstartup startlxde -SecurityTypes None -geometry 1024x768 -fg :1 # Both these should work: -# http://localhost:5901/vnc.html?autoconnect=true -# http://127.0.0.1:8888/lxde/vnc.html?path=%2Flxde%2Fwebsockify&autoconnect=true +# http://localhost:5901/vnc.html +# http://127.0.0.1:8888/lxde