X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=image%2Fbase%2FDockerfile;h=dc21c8bd0df59ef3fb671b7de2df2e1ef7e73ce5;hb=bb83a26acf438d7b5abb3a5eb4f9889235f5eadb;hp=e6c38fee29cd8bffe6fe99f02675503846fa81f2;hpb=232065f64a0fe93994c0dc56c628a49139f02798;p=discourse_docker.git diff --git a/image/base/Dockerfile b/image/base/Dockerfile index e6c38fe..dc21c8b 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -1,13 +1,14 @@ # NAME: discourse/base -# VERSION: 1.3.7 +# VERSION: release FROM ubuntu:16.04 -ENV PG_MAJOR 9.5 -ENV PG_VERSION 9.5.5-1.pgdg16.04+1 +ENV PG_MAJOR 10 +ENV RUBY_ALLOCATOR /usr/lib/libjemalloc.so.1 +ENV COMPRESS_BROTLI 1 -MAINTAINER Sam Saffron "https://twitter.com/samsaffron" +#LABEL maintainer="Sam Saffron \"https://twitter.com/samsaffron\"" -ADD VERSION /VERSION +RUN echo 2.0.`date +%Y%m%d` > /VERSION RUN apt-get update && apt-get install -y lsb-release sudo curl RUN echo "debconf debconf/frontend select Teletype" | debconf-set-selections @@ -22,16 +23,16 @@ RUN apt-get -y upgrade 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_8.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 \ + 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 + 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 @@ -44,37 +45,42 @@ RUN cd / &&\ rm -f /etc/apt/apt.conf.d/40proxy &&\ locale-gen en_US &&\ apt-get install -y nodejs &&\ - npm install uglify-js -g &&\ - npm install svgo -g + npm install -g uglify-js@"<3" &&\ + npm install -g svgo &&\ + npm install -g prettier ADD install-nginx /tmp/install-nginx RUN /tmp/install-nginx RUN apt-get -y install advancecomp jhead jpegoptim libjpeg-turbo-progs optipng +RUN mkdir /jemalloc-stable && cd /jemalloc-stable &&\ + 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-stable -# 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 +RUN mkdir /jemalloc-new && cd /jemalloc-new &&\ + wget https://github.com/jemalloc/jemalloc/releases/download/5.1.0/jemalloc-5.1.0.tar.bz2 &&\ + tar -xjf jemalloc-5.1.0.tar.bz2 && cd jemalloc-5.1.0 && ./configure --prefix=/usr --with-install-suffix=5.1.0 && make build_lib && make install_lib &&\ + cd / && rm -rf /jemalloc-new 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.2 /usr/local + cd / && rm -rf /src/ruby-build && (ruby-build 2.4.4 /usr/local) -RUN gem install bundler &&\ - rm -rf /usr/local/share/ri/2.3.0/system &&\ - cd / && git clone https://github.com/SamSaffron/pups.git +RUN gem update --system + +RUN gem install bundler --force &&\ + rm -rf /usr/local/share/ri/2.4.4/system &&\ + cd / && git clone https://github.com/discourse/pups.git ADD install-imagemagick /tmp/install-imagemagick RUN /tmp/install-imagemagick # Validate install -RUN ruby -e "v='`convert -version`'; ['png','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 @@ -84,12 +90,6 @@ RUN /tmp/install-gifsicle ADD install-pngquant /tmp/install-pngquant RUN /tmp/install-pngquant -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 &&\ rm -fr /usr/share/doc &&\ @@ -120,3 +120,17 @@ ADD boot /sbin/boot ADD cron /etc/service/cron/run ADD rsyslog /etc/service/rsyslog/run ADD cron.d_anacron /etc/cron.d/anacron + + +# Discourse specific bits +RUN useradd discourse -s /bin/bash -m -U &&\ + mkdir -p /var/www &&\ + cd /var/www &&\ + git clone https://github.com/discourse/discourse.git &&\ + cd discourse &&\ + git remote set-branches --add origin tests-passed &&\ + chown -R discourse:discourse /var/www/discourse &&\ + cd /var/www/discourse &&\ + sudo -u discourse bundle install --deployment \ + --without test --without development &&\ + find /var/www/discourse/vendor/bundle -name tmp -type d -exec rm -rf {} +