Merge pull request #8 from ColinHuang/master

Remove ubuntu-tw sources and useless package.
This commit is contained in:
DoroWu 2015-03-02 20:54:43 +08:00
commit 5e36ffcc26

View file

@ -4,14 +4,6 @@ MAINTAINER Doro Wu <fcwu.tw@gmail.com>
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
ENV HOME /root ENV HOME /root
# setup our Ubuntu sources (ADD breaks caching)
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
# no Upstart or DBus # no Upstart or DBus
# https://github.com/dotcloud/docker/issues/1724#issuecomment-26294856 # https://github.com/dotcloud/docker/issues/1724#issuecomment-26294856
RUN apt-mark hold initscripts udev plymouth mountall RUN apt-mark hold initscripts udev plymouth mountall
@ -23,14 +15,12 @@ RUN apt-get update \
net-tools \ net-tools \
lxde x11vnc xvfb \ lxde x11vnc xvfb \
gtk2-engines-murrine ttf-ubuntu-font-family \ gtk2-engines-murrine ttf-ubuntu-font-family \
nodejs \
libreoffice firefox \ libreoffice firefox \
&& apt-get autoclean \ && apt-get autoclean \
&& apt-get autoremove \ && apt-get autoremove \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
ADD noVNC /noVNC/ ADD noVNC /noVNC/
ADD startup.sh / ADD startup.sh /
ADD supervisord.conf / ADD supervisord.conf /
EXPOSE 6080 EXPOSE 6080