Merge pull request #109 from fantasticfears/ref

[discourse_docker.git] / image / base / Dockerfile

diff --git a/image/base/Dockerfile b/image/base/Dockerfile
index c5d8bb61b2863935e03f9229e0499211ed765448..abd2b5fb0b7e16381f95cd69ff3fd0f6217bbc89 100644 (file)
--- a/image/base/Dockerfile
+++ b/image/base/Dockerfile
@@ -2,7 +2,7 @@
 # When new LTS ships we can upgrade
 
 # NAME:     discourse_base
-# VERSION:  1.0.1
+# VERSION:  1.0.7
 
 FROM ubuntu:14.04
 
@@ -18,20 +18,22 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
     apt-mark hold initscripts &&\
     apt-get -y upgrade &&\
     add-apt-repository -y ppa:rwky/redis &&\
-    add-apt-repository -y ppa:nginx/stable &&\
+    add-apt-repository -y ppa:nginx/development &&\
     apt-get install -y curl && curl http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - &&\
     echo "deb http://apt.postgresql.org/pub/repos/apt/ trusty-pgdg main" | \
         tee /etc/apt/sources.list.d/postgres.list &&\
+    curl -sL https://deb.nodesource.com/setup | sudo bash - &&\
     apt-get -y update &&\
     apt-get -y install build-essential git curl wget \
                        libxslt-dev libcurl4-openssl-dev \
                        libssl-dev libyaml-dev libtool \
                        libxml2-dev gawk \
-                       pngcrush imagemagick \
+                       pngcrush imagemagick gifsicle \
                        postgresql-9.3 postgresql-client-9.3 \
                        postgresql-contrib-9.3 libpq-dev libreadline-dev \
-                       nginx language-pack-en sudo cron \
+                       nginx language-pack-en sudo cron anacron \
                        psmisc rsyslog vim &&\
+    sed -i -e 's/start -q anacron/anacron -s/' /etc/cron.d/anacron &&\
     sed -i.bak 's/$ModLoad imklog/#$ModLoad imklog/' /etc/rsyslog.conf &&\
     dpkg-divert --local --rename --add /sbin/initctl &&\
     sh -c "test -f /sbin/initctl || ln -s /bin/true /sbin/initctl" &&\
@@ -39,36 +41,51 @@ RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections &&\
     cd / &&\
     mkdir /jemalloc && cd /jemalloc &&\
       wget http://www.canonware.com/download/jemalloc/jemalloc-3.4.1.tar.bz2 &&\
-      tar -xvjf jemalloc-3.4.1.tar.bz2 && cd jemalloc-3.4.1 && ./configure && make &&\
+      tar -xjf jemalloc-3.4.1.tar.bz2 && cd jemalloc-3.4.1 && ./configure && make &&\
       mv lib/libjemalloc.so.1 /usr/lib && cd / && rm -rf /jemalloc &&\
     apt-get -y install runit monit socat &&\
     mkdir -p /etc/runit/1.d &&\
     apt-get clean &&\
     rm -f /etc/apt/apt.conf.d/40proxy &&\
     locale-gen en_US &&\
-    wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-      tar -xjf phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-      rm phantomjs-1.9.7-linux-x86_64.tar.bz2 &&\
-      cp phantomjs-1.9.7-linux-x86_64/bin/phantomjs /bin/phantomjs &&\
-      rm -fr phantomjs-1.9.7-linux-x86_64 &&\
+    wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-1.9.8-linux-x86_64.tar.bz2 &&\
+      tar -xjf phantomjs-1.9.8-linux-x86_64.tar.bz2 &&\
+      rm phantomjs-1.9.8-linux-x86_64.tar.bz2 &&\
+      cp phantomjs-1.9.8-linux-x86_64/bin/phantomjs /bin/phantomjs &&\
+      rm -fr phantomjs-1.9.8-linux-x86_64 &&\
     wget http://static.jonof.id.au/dl/kenutils/pngout-20130221-linux.tar.gz &&\
-      tar -xvf pngout-20130221-linux.tar.gz &&\
+      tar -xf pngout-20130221-linux.tar.gz &&\
       rm pngout-20130221-linux.tar.gz &&\
       cp pngout-20130221-linux/x86_64/pngout /bin/pngout &&\
-      rm -rf pngout-20130221-linux
+      rm -rf pngout-20130221-linux &&\
+    apt-get install -y nodejs &&\
+    npm install uglify-js -g
 
-RUN echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
+RUN add-apt-repository ppa:ubuntu-toolchain-r/test &&\
+    apt-get update &&\
+    apt-get install -y gcc-4.9 &&\
+    (cd /usr/bin && rm gcc && ln -s gcc-4.9 gcc) &&\
+    echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
     mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
     cd /src/ruby-build && ./install.sh &&\
-    cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p481 /usr/local &&\
+    cd / && rm -rf /src/ruby-build && ruby-build 2.0.0-p594 /usr/local &&\
     gem update --system &&\
-    gem install bundler
+    gem install bundler &&\
+    rm -rf /usr/local/share/ri/2.0.0/system &&\
+    cd / && git clone https://github.com/SamSaffron/pups.git
 
-RUN cd / && git clone https://github.com/SamSaffron/pups.git
+# clean up for docker squash
+RUN rm -fr /usr/share/man && rm -fr /usr/share/doc && mkdir -p /etc/runit/3.d
 
 ADD runit-1 /etc/runit/1
 ADD runit-1.d-cleanup-pids /etc/runit/1.d/cleanup-pids
+ADD runit-1.d-anacron /etc/runit/1.d/anacron
 ADD runit-2 /etc/runit/2
+ADD runit-3 /etc/runit/3
+ADD boot /sbin/boot
 
 ADD cron /etc/service/cron/run
 ADD rsyslog /etc/service/rsyslog/run
+
+# this is temporary, remove in 2015
+RUN cp /sbin/boot /sbin/runit