From 570c677faa3f6db95893e82337697e5c42db09cf Mon Sep 17 00:00:00 2001 From: Sam Saffron Date: Wed, 18 Nov 2015 19:23:23 -0500 Subject: [PATCH] bump version --- image/base/Dockerfile | 2 +- image/build.rb | 4 +++- image/discourse/Dockerfile | 4 ++-- image/discourse_fast_switch/Dockerfile | 2 +- image/discourse_test/Dockerfile | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/image/base/Dockerfile b/image/base/Dockerfile index e55f0ed..9adab1d 100644 --- a/image/base/Dockerfile +++ b/image/base/Dockerfile @@ -2,7 +2,7 @@ # When new LTS ships we can upgrade # NAME: discourse_base -# VERSION: 1.0.14 +# VERSION: 1.0.15 FROM ubuntu:14.04 diff --git a/image/build.rb b/image/build.rb index a692a60..8d8efbf 100644 --- a/image/build.rb +++ b/image/build.rb @@ -2,13 +2,14 @@ # require 'pty' -$version = "1.0.14" +$version = "1.0.15" $docker_squash = "https://github.com/jwilder/docker-squash/releases/download/v0.2.0/docker-squash-linux-amd64-v0.2.0.tar.gz" $base_image = "discourse/base:#{$version}" $image = "discourse/discourse:#{$version}" $fast_switch= "discourse/discourse_fast_switch:#{$version}" +$test = "discourse/discourse_test:#{$version}" if ENV["USER"] != "root" STDERR.puts "Build script must be ran as root due to docker-squash" @@ -50,3 +51,4 @@ end build("base",$base_image,true) build("discourse",$image,false) build("discourse_fast_switch",$fast_switch,false) +build("discourse_test",$test,false) diff --git a/image/discourse/Dockerfile b/image/discourse/Dockerfile index 4e24525..198697d 100644 --- a/image/discourse/Dockerfile +++ b/image/discourse/Dockerfile @@ -1,5 +1,5 @@ -# Current version 1.0.14 -FROM discourse/base:1.0.14 +# Current version 1.0.15 +FROM discourse/base:1.0.15 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_fast_switch/Dockerfile b/image/discourse_fast_switch/Dockerfile index dffbfbe..49c4140 100644 --- a/image/discourse_fast_switch/Dockerfile +++ b/image/discourse_fast_switch/Dockerfile @@ -1,6 +1,6 @@ # Allow to easily switch Ruby version in images that derive off this -FROM discourse/discourse:1.0.14 +FROM discourse/discourse:1.0.15 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" diff --git a/image/discourse_test/Dockerfile b/image/discourse_test/Dockerfile index a0a797d..26a1883 100644 --- a/image/discourse_test/Dockerfile +++ b/image/discourse_test/Dockerfile @@ -1,4 +1,4 @@ -FROM discourse/discourse_fast_switch:1.0.14 +FROM discourse/discourse_fast_switch:1.0.15 MAINTAINER Sam Saffron "https://twitter.com/samsaffron" -- 2.25.1