projects
/
discourse_docker.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f6ea6ae
)
Bumps version to 1.3.9
author
Rafael dos Santos Silva
<xfalcox@gmail.com>
Wed, 7 Dec 2016 00:52:33 +0000
(22:52 -0200)
committer
Rafael dos Santos Silva
<xfalcox@gmail.com>
Wed, 7 Dec 2016 00:52:33 +0000
(22:52 -0200)
image/base/Dockerfile
patch
|
blob
|
blame
|
history
image/base/VERSION
patch
|
blob
|
blame
|
history
image/build.rb
patch
|
blob
|
blame
|
history
image/discourse/Dockerfile
patch
|
blob
|
blame
|
history
image/discourse_bench/Dockerfile
patch
|
blob
|
blame
|
history
image/discourse_dev/Dockerfile
patch
|
blob
|
blame
|
history
image/discourse_fast_switch/Dockerfile
patch
|
blob
|
blame
|
history
image/discourse_test/Dockerfile
patch
|
blob
|
blame
|
history
launcher
patch
|
blob
|
blame
|
history
diff --git
a/image/base/Dockerfile
b/image/base/Dockerfile
index c0b212c4bccb7d36c9e109fe50d5c8a65e35df4d..b349de1ffd3f825d3756fc7f694c7c56fb852f1d 100644
(file)
--- a/
image/base/Dockerfile
+++ b/
image/base/Dockerfile
@@
-1,5
+1,5
@@
# NAME: discourse/base
# NAME: discourse/base
-# VERSION: 1.3.
8
+# VERSION: 1.3.
9
FROM ubuntu:16.04
ENV PG_MAJOR 9.5
FROM ubuntu:16.04
ENV PG_MAJOR 9.5
diff --git
a/image/base/VERSION
b/image/base/VERSION
index e05cb3329c6b27f3f99139e553a2ea3cead5203d..d4c4950a37c9ccd904d49625d02288dff4ad8feb 100644
(file)
--- a/
image/base/VERSION
+++ b/
image/base/VERSION
@@
-1
+1
@@
-1.3.
8
+1.3.
9
diff --git
a/image/build.rb
b/image/build.rb
index 33f5872bd16b89e313547bf36d0825bf8550dc52..d27857d14d9420f0d57e28acc2363bbf083be329 100644
(file)
--- a/
image/build.rb
+++ b/
image/build.rb
@@
-73,7
+73,7
@@
end.parse!
DEFAULT_IMAGES = %i[base discourse discourse_test discourse_dev discourse_bench]
todo = options[:image] || DEFAULT_IMAGES
DEFAULT_IMAGES = %i[base discourse discourse_test discourse_dev discourse_bench]
todo = options[:image] || DEFAULT_IMAGES
-version = options[:version] || '1.3.
8
'
+version = options[:version] || '1.3.
9
'
if ENV["USER"] != "root"
STDERR.puts "Build script must be ran as root due to docker-squash"
if ENV["USER"] != "root"
STDERR.puts "Build script must be ran as root due to docker-squash"
diff --git
a/image/discourse/Dockerfile
b/image/discourse/Dockerfile
index 5d588f693063fb86352a4a124bc576614f557254..bd40ae6e79b4dbffadfc0f5af44b68a9cf9ab441 100644
(file)
--- a/
image/discourse/Dockerfile
+++ b/
image/discourse/Dockerfile
@@
-1,6
+1,6
@@
# NAME: discourse/discourse
# NAME: discourse/discourse
-# VERSION: 1.3.
8
-FROM discourse/base:1.3.
8
+# VERSION: 1.3.
9
+FROM discourse/base:1.3.
9
MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
diff --git
a/image/discourse_bench/Dockerfile
b/image/discourse_bench/Dockerfile
index 38a9669eadc3a2f7d14e51718669c972d110654c..16c000f17419079d7ac5d5159040d63b44850f75 100644
(file)
--- a/
image/discourse_bench/Dockerfile
+++ b/
image/discourse_bench/Dockerfile
@@
-1,6
+1,6
@@
# NAME: discourse/discourse_bench
# NAME: discourse/discourse_bench
-# VERSION: 1.3.
8
-FROM discourse/discourse_test:1.3.
8
+# VERSION: 1.3.
9
+FROM discourse/discourse_test:1.3.
9
MAINTAINER Gerhard Schlager <mail@gerhard-schlager.at>
MAINTAINER Gerhard Schlager <mail@gerhard-schlager.at>
diff --git
a/image/discourse_dev/Dockerfile
b/image/discourse_dev/Dockerfile
index 69fa17df77f9c19a87a969dcdfd53717487ad50c..071f8949058225ccc15a1303740b78fa615f59f2 100644
(file)
--- a/
image/discourse_dev/Dockerfile
+++ b/
image/discourse_dev/Dockerfile
@@
-1,6
+1,6
@@
# NAME: discourse/discourse_dev
# NAME: discourse/discourse_dev
-# VERSION: 1.3.
8
-FROM discourse/base:1.3.
8
+# VERSION: 1.3.
9
+FROM discourse/base:1.3.
9
MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
diff --git
a/image/discourse_fast_switch/Dockerfile
b/image/discourse_fast_switch/Dockerfile
index d3614030047f634810c5c01995db96837cd95c33..d717446077445c7ea4ac1abf8de667fd9e840c73 100644
(file)
--- a/
image/discourse_fast_switch/Dockerfile
+++ b/
image/discourse_fast_switch/Dockerfile
@@
-1,8
+1,8
@@
# NAME: discourse/discourse_fast_switch
# NAME: discourse/discourse_fast_switch
-# VERSION: 1.3.
8
+# VERSION: 1.3.
9
# 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.
8
+FROM discourse/base:1.3.
9
MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
diff --git
a/image/discourse_test/Dockerfile
b/image/discourse_test/Dockerfile
index 173e133660f0d29c744adaa7daf0334c47d7f768..af59cd5ef39ebbf437e84552de160d66f1c563d3 100644
(file)
--- a/
image/discourse_test/Dockerfile
+++ b/
image/discourse_test/Dockerfile
@@
-1,6
+1,6
@@
# NAME: discourse/discourse_test
# NAME: discourse/discourse_test
-# VERSION: 1.3.
8
-FROM discourse/discourse:1.3.
8
+# VERSION: 1.3.
9
+FROM discourse/discourse:1.3.
9
MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
MAINTAINER Sam Saffron "https://twitter.com/samsaffron"
diff --git
a/launcher
b/launcher
index c152fe030316f884c223d214120be56f68e0ae2b..c58d1db1f3f2749655b4db2e39700e367fe129dd 100755
(executable)
--- a/
launcher
+++ b/
launcher
@@
-64,7
+64,7
@@
git_rec_version='1.8.0'
config_file=containers/"$config".yml
cidbootstrap=cids/"$config"_bootstrap.cid
local_discourse=local_discourse
config_file=containers/"$config".yml
cidbootstrap=cids/"$config"_bootstrap.cid
local_discourse=local_discourse
-image=discourse/discourse:1.3.
8
+image=discourse/discourse:1.3.
9
docker_path=`which docker.io || which docker`
git_path=`which git`
docker_path=`which docker.io || which docker`
git_path=`which git`