discourse
/
discourse_docker
mirror of https://github.com/discourse/discourse_docker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependencies (#429) 

* Ruby 2.6.3 which has a couple of Unicode improvements

* nginx from 1.5.9 to 1.5.12 (http://nginx.org/en/CHANGES)

* ImageMagick 7.0.8-42 and switch it back to using GitHub, because only the latest release is available on the official site and this regularly breaks our build

* libpng from 1.6.36 to 1.6.37 (security fix)

* gifsicle from 1.91 to 1.92 (http://www.lcdf.org/gifsicle/changes.html)

* Node.js v10, the latest active LTS (https://nodejs.org/en/about/releases/)
This commit is contained in:
Gerhard Schlager 2019-04-27 10:08:16 +02:00 committed by Sam
parent 755ab5acfb
commit ff9ddabe38
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
image/base/Dockerfile
View File

@ -22,7 +22,7 @@ RUN apt-get -y upgrade
RUN curl http://apt.postgresql.org/pub/repos/apt/ACCC4CF8.asc | apt-key add - 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" | \ RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ $(lsb_release -sc)-pgdg main" | \
tee /etc/apt/sources.list.d/postgres.list tee /etc/apt/sources.list.d/postgres.list
RUN curl --silent --location https://deb.nodesource.com/setup_8.x | sudo bash - RUN curl --silent --location https://deb.nodesource.com/setup_10.x | sudo bash -
RUN apt-get -y update RUN apt-get -y update
RUN apt-get -y install build-essential git wget \ RUN apt-get -y install build-essential git wget \
libxslt-dev libcurl4-openssl-dev \ libxslt-dev libcurl4-openssl-dev \
@ -66,12 +66,12 @@ RUN mkdir /jemalloc-new && cd /jemalloc-new &&\
RUN echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\ RUN echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\ mkdir /src && cd /src && git clone https://github.com/sstephenson/ruby-build.git &&\
cd /src/ruby-build && ./install.sh &&\ cd /src/ruby-build && ./install.sh &&\
cd / && rm -rf /src/ruby-build && (ruby-build 2.6.2 /usr/local) cd / && rm -rf /src/ruby-build && (ruby-build 2.6.3 /usr/local)
RUN gem update --system RUN gem update --system
RUN gem install bundler --force &&\ RUN gem install bundler --force &&\
rm -rf /usr/local/share/ri/2.6.2/system &&\ rm -rf /usr/local/share/ri/2.6.3/system &&\
cd / && git clone https://github.com/discourse/pups.git cd / && git clone https://github.com/discourse/pups.git
ADD install-redis /tmp/install-redis ADD install-redis /tmp/install-redis

2
image/base/install-gifsicle
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
VERSION=1.91 VERSION=1.92
cd /tmp cd /tmp
curl -O http://www.lcdf.org/gifsicle/gifsicle-$VERSION.tar.gz curl -O http://www.lcdf.org/gifsicle/gifsicle-$VERSION.tar.gz
tar zxf gifsicle-$VERSION.tar.gz tar zxf gifsicle-$VERSION.tar.gz

6
image/base/install-imagemagick
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
set -o errexit set -o errexit
IMAGE_MAGICK_VERSION="7.0.8-41" IMAGE_MAGICK_VERSION="7.0.8-42"
LIBPNG_VERSION="1.6.36" LIBPNG_VERSION="1.6.37"
PREFIX=/usr/local PREFIX=/usr/local
WDIR=/tmp/imagemagick WDIR=/tmp/imagemagick
@ -25,7 +25,7 @@ cd $WDIR/libpng-$LIBPNG_VERSION
make all && make install make all && make install
# Build and install ImageMagick # Build and install ImageMagick
wget -O $WDIR/ImageMagick.tar.gz "https://imagemagick.org/download/ImageMagick-$IMAGE_MAGICK_VERSION.tar.gz" wget -O $WDIR/ImageMagick.tar.gz "https://github.com/ImageMagick/ImageMagick/archive/$IMAGE_MAGICK_VERSION.tar.gz"
IMDIR=$WDIR/$(tar tzf $WDIR/ImageMagick.tar.gz --wildcards "ImageMagick-*/configure" |cut -d/ -f1) IMDIR=$WDIR/$(tar tzf $WDIR/ImageMagick.tar.gz --wildcards "ImageMagick-*/configure" |cut -d/ -f1)
tar zxf $WDIR/ImageMagick.tar.gz -C $WDIR tar zxf $WDIR/ImageMagick.tar.gz -C $WDIR
cd $IMDIR cd $IMDIR

2
image/base/install-nginx
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
VERSION=1.15.9 VERSION=1.15.12
cd /tmp cd /tmp
apt-get install -y autoconf apt-get install -y autoconf

1
image/discourse_dev/Dockerfile
View File

@ -42,7 +42,6 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo ap
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list &&\ echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list &&\
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - &&\ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - &&\
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list &&\ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list &&\
curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - &&\
apt-get update &&\ apt-get update &&\
apt-get install -y google-chrome-stable yarn nodejs &&\ apt-get install -y google-chrome-stable yarn nodejs &&\
npm install -g eslint babel-eslint npm install -g eslint babel-eslint

1
image/discourse_test/Dockerfile
View File

@ -21,7 +21,6 @@ RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo ap
echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list &&\ echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list &&\
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - &&\ curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - &&\
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list &&\ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list &&\
curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - &&\
apt-get update &&\ apt-get update &&\
apt-get install -y libgconf-2-4 google-chrome-stable yarn nodejs &&\ apt-get install -y libgconf-2-4 google-chrome-stable yarn nodejs &&\
npm install -g eslint babel-eslint &&\ npm install -g eslint babel-eslint &&\