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

Update image dependencies 

- Update NGINX to latest stable
- Update pngquant to latest stable
- Update ImageMagick to latest stable

Also, remove extra ruby install, it is no longer needed
This commit is contained in:
Sam 2019-02-18 15:17:21 +11:00
parent 2ad250b872
commit f77ca5a863
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
image/base/Dockerfile
View File

@ -64,12 +64,10 @@ RUN mkdir /jemalloc-new && cd /jemalloc-new &&\
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 &&\ 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 cd / && rm -rf /jemalloc-new
RUN apt-get -y install ruby &&\ RUN echo 'gem: --no-document' >> /usr/local/etc/gemrc &&\
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.1 /usr/local) &&\ cd / && rm -rf /src/ruby-build && (ruby-build 2.6.1 /usr/local)
apt-get -y remove ruby
RUN gem update --system RUN gem update --system

2
image/base/install-imagemagick
View File

@ -17,7 +17,7 @@ cd $WDIR/libpng
make all && make install make all && make install
# Build and install ImageMagick # Build and install ImageMagick
wget -O $WDIR/ImageMagick.tar.gz "https://github.com/ImageMagick/ImageMagick/archive/7.0.8-6.tar.gz" wget -O $WDIR/ImageMagick.tar.gz "https://github.com/ImageMagick/ImageMagick/archive/7.0.8-23.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.0 VERSION=1.15.8
cd /tmp cd /tmp
apt-get install -y autoconf apt-get install -y autoconf

2
image/base/install-pngquant
View File

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
VERSION=2.12.1 VERSION=2.12.2
cd /tmp cd /tmp
git clone -b $VERSION --single-branch https://github.com/pornel/pngquant git clone -b $VERSION --single-branch https://github.com/pornel/pngquant
cd pngquant cd pngquant