NoVNC default connect

fcwu · fcwu · commit 54ece843619d · 2014-03-12T00:18:40.000+08:00
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,6 @@ FROM ubuntu:12.04
 MAINTAINER Doro Wu <fcwu.tw@gmail.com>
 
 ENV DEBIAN_FRONTEND noninteractive
-ENV HTTP_PROXY http://172.17.42.1:3134
 
 # setup our Ubuntu sources (ADD breaks caching)
 RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ precise main\n\
@@ -16,16 +15,16 @@ deb http://us.archive.ubuntu.com/ubuntu/ precise restricted\n\
 RUN apt-mark hold initscripts udev plymouth mountall
 RUN dpkg-divert --local --rename --add /sbin/initctl && ln -s /bin/true /sbin/initctl
 
-RUN apt-get update
+RUN HTTP_PROXY=http://172.17.42.1:3142 apt-get update
 
 # install our "base" environment
-RUN apt-get install -y --no-install-recommends openssh-server pwgen sudo vim-tiny
-RUN apt-get install -y --no-install-recommends lxde
-RUN apt-get install -y --no-install-recommends x11vnc xvfb
-RUN apt-get install -y supervisor
-RUN apt-get install -y libreoffice firefox
+RUN HTTP_PROXY=http://172.17.42.1:3142 apt-get install -y --no-install-recommends openssh-server pwgen sudo vim-tiny
+RUN HTTP_PROXY=http://172.17.42.1:3142 apt-get install -y --no-install-recommends lxde
+RUN HTTP_PROXY=http://172.17.42.1:3142 apt-get install -y --no-install-recommends x11vnc xvfb
+RUN HTTP_PROXY=http://172.17.42.1:3142 apt-get install -y supervisor
+RUN HTTP_PROXY=http://172.17.42.1:3142 apt-get install -y libreoffice firefox
 # noVNC
-RUN apt-get install -y net-tools
+RUN HTTP_PROXY=http://172.17.42.1:3142 apt-get install -y net-tools
 
 ADD startup.sh /
 ADD supervisord.conf /
diff --git a/noVNC/index.html b/noVNC/index.html
@@ -0,0 +1,15 @@
+<!DOCTYPE HTML>
+<html lang="en-US">
+    <head>
+        <meta charset="UTF-8">
+        <meta http-equiv="refresh" content="1;url=vnc_auto.html">
+        <script type="text/javascript">
+            window.location.href = "vnc_auto.html"
+        </script>
+        <title>Page Redirection</title>
+    </head>
+    <body>
+        <!-- Note: don't tell people to `click` the link, just tell them that it is a link. -->
+        If you are not redirected automatically, follow the <a href='http://example.com'>link to example</a>
+    </body>
+</html>
