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

base image update

This commit is contained in:
Sam 2016-09-01 10:18:32 +10:00
parent 5a92b90f08
commit 089e57a231
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
image/base/Dockerfile
View File

@ -1,10 +1,10 @@
# NAME: discourse/base # NAME: discourse/base
# VERSION: 1.3.5 # VERSION: 1.3.6
FROM ubuntu:16.04 FROM ubuntu:16.04
ENV PG_MAJOR 9.5 ENV PG_MAJOR 9.5
ENV PG_VERSION 9.5.3-1.pgdg16.04+1 ENV PG_VERSION 9.5.4-1.pgdg16.04+1
MAINTAINER Sam Saffron "https://twitter.com/samsaffron" MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
@ -120,4 +120,4 @@ ADD boot /sbin/boot
ADD cron /etc/service/cron/run ADD cron /etc/service/cron/run
ADD rsyslog /etc/service/rsyslog/run ADD rsyslog /etc/service/rsyslog/run
ADD cron.d-anacron /etc/cron.d/anacron ADD cron.d_anacron /etc/cron.d/anacron

2
image/base/install-gifsicle
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
VERSION=1.87 VERSION=1.88
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

4
image/base/install-imagemagick
View File

@ -10,7 +10,7 @@ WDIR=/tmp/imagemagick
mkdir -p $WDIR mkdir -p $WDIR
# Build and install libpng # Build and install libpng
git clone -b v1.6.21 git://git.code.sf.net/p/libpng/code $WDIR/libpng git clone -b v1.6.24 git://git.code.sf.net/p/libpng/code $WDIR/libpng
cd $WDIR/libpng cd $WDIR/libpng
./autogen.sh ./autogen.sh
./configure --prefix=$PREFIX ./configure --prefix=$PREFIX
@ -19,7 +19,7 @@ make all && make install
# Build and install ImageMagick # Build and install ImageMagick
wget -O $WDIR/ImageMagick.tar.gz "http://www.imagemagick.org/download/ImageMagick-6.9.4-8.tar.gz" wget -O $WDIR/ImageMagick.tar.gz "http://www.imagemagick.org/download/ImageMagick-6.9.5-8.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

4
image/base/install-pngcrush
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
set -e set -e
PNGCRUSH_VERSION=1.7.92 PNGCRUSH_VERSION=1.8.5
cd /tmp cd /tmp
wget http://iweb.dl.sourceforge.net/project/pmt/pngcrush/$PNGCRUSH_VERSION/pngcrush-$PNGCRUSH_VERSION.tar.gz wget https://sourceforge.net/projects/pmt/files/pngcrush/$PNGCRUSH_VERSION/pngcrush-$PNGCRUSH_VERSION.tar.gz/download -O pngcrush-$PNGCRUSH_VERSION.tar.gz
tar zxf pngcrush-$PNGCRUSH_VERSION.tar.gz tar zxf pngcrush-$PNGCRUSH_VERSION.tar.gz
cd pngcrush-$PNGCRUSH_VERSION cd pngcrush-$PNGCRUSH_VERSION
make && cp -f pngcrush /usr/local/bin make && cp -f pngcrush /usr/local/bin

2
image/build.rb
View File

@ -2,7 +2,7 @@
# #
require 'pty' require 'pty'
$version = "1.3.5" $version = "1.3.6"
$docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.2.0/docker-squash-linux-amd64-v0.2.0.tar.gz" $docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.2.0/docker-squash-linux-amd64-v0.2.0.tar.gz"

4
image/discourse/Dockerfile
View File

@ -1,5 +1,5 @@
# Current version 1.3.5 # Current version 1.3.6
FROM discourse/base:1.3.5 FROM discourse/base:1.3.6
MAINTAINER Sam Saffron "https://twitter.com/samsaffron" MAINTAINER Sam Saffron "https://twitter.com/samsaffron"

2
image/discourse_test/Dockerfile
View File

@ -1,4 +1,4 @@
FROM discourse/discourse:1.3.5 FROM discourse/discourse:1.3.6
MAINTAINER Sam Saffron "https://twitter.com/samsaffron" MAINTAINER Sam Saffron "https://twitter.com/samsaffron"