From 134df274c74a8592715d873406f6392063bde51c Mon Sep 17 00:00:00 2001
From: Doro Wu <fcwu.tw@gmail.com>
Date: Fri, 30 May 2014 09:49:39 +0800
Subject: [PATCH] Downsize final image

---
 Dockerfile | 54 +++++++++++++++++++++---------------------------------
 startup.sh |  2 --
 2 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e8bd5ef..fef179f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,56 +1,44 @@
-FROM ubuntu:12.04
+FROM ubuntu:14.04
 MAINTAINER Doro Wu <fcwu.tw@gmail.com>
 
 ENV DEBIAN_FRONTEND noninteractive
+ENV HOME /root
 
 # setup our Ubuntu sources (ADD breaks caching)
-RUN echo "deb http://us.archive.ubuntu.com/ubuntu/ precise main\n\
-deb http://us.archive.ubuntu.com/ubuntu/ precise multiverse\n\
-deb http://us.archive.ubuntu.com/ubuntu/ precise universe\n\
-deb http://us.archive.ubuntu.com/ubuntu/ precise restricted\n\
-deb http://ppa.launchpad.net/chris-lea/node.js/ubuntu precise main\n\
+RUN echo "deb http://tw.archive.ubuntu.com/ubuntu/ trusty main\n\
+deb http://tw.archive.ubuntu.com/ubuntu/ trusty multiverse\n\
+deb http://tw.archive.ubuntu.com/ubuntu/ trusty universe\n\
+deb http://tw.archive.ubuntu.com/ubuntu/ trusty restricted\n\
+deb http://ppa.launchpad.net/chris-lea/node.js/ubuntu trusty main\n\
 "> /etc/apt/sources.list
 
-#RUN echo "Acquire::http { Proxy \"http://172.17.42.1:3142\"; };\n\
-#Acquire::http::Proxy {\n\
-#    private-ppa.launchpad.net DIRECT;\n\
-#    download.virtualbox.org DIRECT;\n\
-#}\n\
-#" > /etc/apt/apt.conf.d/90apt-cacher-ng
-
 # no Upstart or DBus
 # https://github.com/dotcloud/docker/issues/1724#issuecomment-26294856
 RUN apt-mark hold initscripts udev plymouth mountall
 RUN dpkg-divert --local --rename --add /sbin/initctl && ln -sf /bin/true /sbin/initctl
 
-RUN apt-get update
+RUN apt-get update \
+    && apt-get install -y --force-yes --no-install-recommends supervisor \
+        openssh-server pwgen sudo vim-tiny \
+        net-tools \
+        lxde x11vnc xvfb \
+        gtk2-engines-murrine ttf-ubuntu-font-family \
+        nodejs \
+        libreoffice firefox \
+    && apt-get autoclean \
+    && apt-get autoremove \
+    && rm -rf /var/lib/apt/lists/*
 
-# install our "base" environment
-RUN apt-get install -y --no-install-recommends openssh-server pwgen sudo vim-tiny
+# Add 
+ADD ambiance-radiance-xfce-lxde_2.0~trusty~NoobsLab.com_all.deb /
+RUN dpkg -i *.deb
 
-# install tty.js
-RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys C7917B12
-RUN apt-get install -y --force-yes nodejs
-ADD tty.js /tty.js/
-
-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
-
-# noVNC
-RUN apt-get install -y net-tools
 ADD noVNC /noVNC/
 
-# clean up after ourselves
-RUN apt-get clean
-#RUN rm /etc/apt/apt.conf.d/90apt-cacher-ng
-
 ADD startup.sh /
 ADD supervisord.conf /
 EXPOSE 6080
 EXPOSE 5900
-EXPOSE 3000
 EXPOSE 22
 WORKDIR /
 ENTRYPOINT ["/startup.sh"]
diff --git a/startup.sh b/startup.sh
index 47d08b1..7f60e18 100755
--- a/startup.sh
+++ b/startup.sh
@@ -11,8 +11,6 @@ echo "ubuntu:$PASS" | chpasswd
 
 /usr/bin/supervisord -c /supervisord.conf
 
-cd /tty.js && node ./tty-me.js --daemonize
-
 while [ 1 ]; do
     /bin/bash
 done