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

Bumps image version to 1.3.10

This commit is contained in:
Rafael dos Santos Silva 2016-12-28 16:29:13 -02:00
parent 24c757dfca
commit 0dbab775b0
9 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
image/base/Dockerfile
View File

@ -1,5 +1,5 @@
# NAME: discourse/base # NAME: discourse/base
# VERSION: 1.3.9 # VERSION: 1.3.10
FROM ubuntu:16.04 FROM ubuntu:16.04
ENV PG_MAJOR 9.5 ENV PG_MAJOR 9.5

2
image/base/VERSION
View File

@ -1 +1 @@
1.3.9 1.3.10

2
image/build.rb
View File

@ -73,7 +73,7 @@ end.parse!
DEFAULT_IMAGES = %i[base discourse discourse_test discourse_dev discourse_bench] DEFAULT_IMAGES = %i[base discourse discourse_test discourse_dev discourse_bench]
todo = options[:image] || DEFAULT_IMAGES todo = options[:image] || DEFAULT_IMAGES
version = options[:version] || '1.3.9' version = options[:version] || '1.3.10'
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,6 +1,6 @@
# NAME: discourse/discourse # NAME: discourse/discourse
# VERSION: 1.3.9 # VERSION: 1.3.10
FROM discourse/base:1.3.9 FROM discourse/base:1.3.10
MAINTAINER Sam Saffron "https://twitter.com/samsaffron" MAINTAINER Sam Saffron "https://twitter.com/samsaffron"

4
image/discourse_bench/Dockerfile
View File

@ -1,6 +1,6 @@
# NAME: discourse/discourse_bench # NAME: discourse/discourse_bench
# VERSION: 1.3.9 # VERSION: 1.3.10
FROM discourse/discourse_test:1.3.9 FROM discourse/discourse_test:1.3.10
MAINTAINER Gerhard Schlager <mail@gerhard-schlager.at> MAINTAINER Gerhard Schlager <mail@gerhard-schlager.at>

4
image/discourse_dev/Dockerfile
View File

@ -1,6 +1,6 @@
# NAME: discourse/discourse_dev # NAME: discourse/discourse_dev
# VERSION: 1.3.9 # VERSION: 1.3.10
FROM discourse/base:1.3.9 FROM discourse/base:1.3.10
MAINTAINER Sam Saffron "https://twitter.com/samsaffron" MAINTAINER Sam Saffron "https://twitter.com/samsaffron"

4
image/discourse_fast_switch/Dockerfile
View File

@ -1,8 +1,8 @@
# NAME: discourse/discourse_fast_switch # NAME: discourse/discourse_fast_switch
# VERSION: 1.3.9 # VERSION: 1.3.10
# 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 discourse/base:1.3.9 FROM discourse/base:1.3.10
MAINTAINER Sam Saffron "https://twitter.com/samsaffron" MAINTAINER Sam Saffron "https://twitter.com/samsaffron"

4
image/discourse_test/Dockerfile
View File

@ -1,6 +1,6 @@
# NAME: discourse/discourse_test # NAME: discourse/discourse_test
# VERSION: 1.3.9 # VERSION: 1.3.10
FROM discourse/discourse:1.3.9 FROM discourse/discourse:1.3.10
MAINTAINER Sam Saffron "https://twitter.com/samsaffron" MAINTAINER Sam Saffron "https://twitter.com/samsaffron"

2
launcher
View File

@ -64,7 +64,7 @@ git_rec_version='1.8.0'
config_file=containers/"$config".yml config_file=containers/"$config".yml
cidbootstrap=cids/"$config"_bootstrap.cid cidbootstrap=cids/"$config"_bootstrap.cid
local_discourse=local_discourse local_discourse=local_discourse
image=discourse/discourse:1.3.9 image=discourse/discourse:1.3.10
docker_path=`which docker.io || which docker` docker_path=`which docker.io || which docker`
git_path=`which git` git_path=`which git`