-# NAME: discourse_base
-# VERSION: 1.3.3
-
+# NAME: discourse/base
+# VERSION: 1.4.0
FROM ubuntu:16.04
ENV PG_MAJOR 9.5
-ENV PG_VERSION 9.5.3-1.pgdg16.04+1
+ENV RUBY_ALLOCATOR /usr/lib/libjemalloc.so.1
+ENV COMPRESS_BROTLI 1
MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
-RUN echo "1.3.3" > /VERSION
+ADD VERSION /VERSION
RUN apt-get update && apt-get install -y lsb-release sudo curl
RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections
RUN apt-get -y install software-properties-common
RUN apt-mark hold initscripts
RUN apt-get -y upgrade
-RUN add-apt-repository -y ppa:nginx/development
RUN curl http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add -
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -sc)-pgdg main" | \
tee /etc/apt/sources.list.d/postgres.list
-RUN curl --silent --location https://deb.nodesource.com/setup_4.x | sudo bash -
+RUN curl --silent --location https://deb.nodesource.com/setup_6.x | sudo bash -
RUN apt-get -y update
RUN apt-get -y install build-essential git wget \
libxslt-dev libcurl4-openssl-dev \
libssl-dev libyaml-dev libtool \
libxml2-dev gawk parallel \
- postgresql-${PG_MAJOR}=${PG_VERSION} postgresql-client-${PG_MAJOR}=${PG_VERSION} \
- postgresql-contrib-${PG_MAJOR}=${PG_VERSION} libpq-dev libreadline-dev \
- nginx language-pack-en cron anacron \
- psmisc rsyslog vim whois
+ postgresql-${PG_MAJOR} postgresql-client-${PG_MAJOR} \
+ postgresql-contrib-${PG_MAJOR} libpq-dev libreadline-dev \
+ language-pack-en cron anacron \
+ psmisc rsyslog vim whois brotli libunwind-dev
RUN sed -i -e 's/start -q anacron/anacron -s/' /etc/cron.d/anacron
RUN sed -i.bak 's/$ModLoad imklog/#$ModLoad imklog/' /etc/rsyslog.conf
RUN dpkg-divert --local --rename --add /sbin/initctl
apt-get install -y nodejs &&\
npm install uglify-js -g &&\
npm install svgo -g
+
+ADD install-nginx /tmp/install-nginx
+RUN /tmp/install-nginx
+
RUN apt-get -y install advancecomp jhead jpegoptim libjpeg-turbo-progs optipng
-# consider upgrading this
RUN mkdir /jemalloc && cd /jemalloc &&\
- wget http://www.canonware.com/download/jemalloc/jemalloc-3.6.0.tar.bz2 &&\
- tar -xjf jemalloc-3.6.0.tar.bz2 && cd jemalloc-3.6.0 && ./configure && make &&\
- mv lib/libjemalloc.so.1 /usr/lib && cd / && rm -rf /jemalloc
+ wget https://github.com/jemalloc/jemalloc/releases/download/3.6.0/jemalloc-3.6.0.tar.bz2 &&\
+ tar -xjf jemalloc-3.6.0.tar.bz2 && cd jemalloc-3.6.0 && ./configure --prefix=/usr && make && make install &&\
+ cd / && rm -rf /jemalloc
+
+RUN mkdir /gperftools && git clone https://github.com/gperftools/gperftools.git /gperftools &&\
+ cd /gperftools && git checkout gperftools-2.5 && ./autogen.sh && ./configure --prefix=$PWD/lib &&\
+ make install && mv lib/lib/libtcmalloc_minimal.so.4.3.0 /usr/lib && cd / && rm -rf /gperftools
+
+RUN mkdir /lockless && cd /lockless && curl -O https://locklessinc.com/downloads/lockless_allocator_linux.tgz &&\
+ tar zxf lockless_allocator_linux.tgz && mv lockless_allocator_linux/64bit/libllalloc.so.1.4 /usr/lib &&\
+ cd / && rm -rf /lockless
RUN 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.3.1 /usr/local
+ cd / && rm -rf /src/ruby-build && ruby-build 2.4.1 /usr/local
RUN gem install bundler &&\
- rm -rf /usr/local/share/ri/2.3.0/system &&\
+ rm -rf /usr/local/share/ri/2.4.1/system &&\
cd / && git clone https://github.com/SamSaffron/pups.git
ADD install-imagemagick /tmp/install-imagemagick
RUN /tmp/install-imagemagick
# Validate install
-RUN ruby -e "v='`convert -version`'; ['png','gif','tiff','jpeg','freetype'].each{ |f| ((STDERR.puts('no ' + f + ' support in imagemagick')); exit(-1)) unless v.include?(f)}"
+RUN ruby -Eutf-8 -e "v = \`convert -version\`; %w{png tiff jpeg freetype}.each { |f| unless v.include?(f); STDERR.puts('no ' + f + ' support in imagemagick'); exit(-1); end }"
-#
ADD install-pngcrush /tmp/install-pngcrush
RUN /tmp/install-pngcrush
ADD install-pngquant /tmp/install-pngquant
RUN /tmp/install-pngquant
-RUN cd tmp && wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
-RUN cd tmp && tar jxf phantomjs-2.1.1-linux-x86_64.tar.bz2 && mv /tmp/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin
+ADD phantomjs /usr/local/bin/phantomjs
+
+# Not using the official repo until they compile against a recent openssl
+# RUN cd tmp && wget https://bitbucket.org/ariya/phantomjs/downloads/phantomjs-2.1.1-linux-x86_64.tar.bz2
+# RUN cd tmp && tar jxf phantomjs-2.1.1-linux-x86_64.tar.bz2 && mv /tmp/phantomjs-2.1.1-linux-x86_64/bin/phantomjs /usr/local/bin
# clean up for docker squash
RUN rm -fr /usr/share/man &&\
# this can probably be done, but I worry that people changing PG locales will have issues
# cd /usr/share/locale && rm -fr `ls -d */ | grep -v en`
-
RUN 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-1.d-00-fix-var-logs /etc/runit/1.d/00-fix-var-logs
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
+ADD cron.d_anacron /etc/cron.d/anacron