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

upgrade images

This commit is contained in:
Sam Saffron 2015-11-18 00:49:02 -05:00
parent 7799fb73df
commit 399a0bba08
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image/base/Dockerfile
View File

@ -2,7 +2,7 @@
# When new LTS ships we can upgrade # When new LTS ships we can upgrade
# NAME: discourse_base # NAME: discourse_base
# VERSION: 1.0.13 # VERSION: 1.0.14
FROM ubuntu:14.04 FROM ubuntu:14.04

2
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.16 git://git.code.sf.net/p/libpng/code $WDIR/libpng git clone -b v1.6.19 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

10
image/build.rb
View File

@ -2,13 +2,13 @@
# #
require 'pty' require 'pty'
$version = "1.0.13" $version = "1.0.14"
$docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.0.11/docker-squash-linux-amd64-v0.0.11.tar.gz" $docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.2.0/docker-squash-linux-amd64-v0.2.0.tar.gz"
$base_image = "samsaffron/discourse_base:#{$version}" $base_image = "discourse/base:#{$version}"
$image = "samsaffron/discourse:#{$version}" $image = "discourse/discourse:#{$version}"
$fast_switch= "samsaffron/discourse_fast_switch:#{$version}" $fast_switch= "discourse/discourse_fast_switch:#{$version}"
if ENV["USER"] != "root" if ENV["USER"] != "root"
STDERR.puts "Build script must be ran as root due to docker-squash" STDERR.puts "Build script must be ran as root due to docker-squash"

4
image/discourse/Dockerfile
View File

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

2
image/discourse_fast_switch/Dockerfile
View File

@ -1,6 +1,6 @@
# Allow to easily switch Ruby version in images that derive off this # Allow to easily switch Ruby version in images that derive off this
FROM samsaffron/discourse:1.0.13 FROM discourse/discourse:1.0.14
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 samsaffron/discourse_fast_switch:1.0.12 FROM discourse/discourse_fast_switch:1.0.14
MAINTAINER Sam Saffron "https://twitter.com/samsaffron" MAINTAINER Sam Saffron "https://twitter.com/samsaffron"