conjure 0.2.2 → 0.2.3
Sign up to get free protection for your applications and to get access to all the features.
- data/History.md +5 -0
- data/lib/conjure/provision/dockerfile.rb +1 -1
- data/lib/conjure/provision/instance.rb +6 -1
- data/lib/conjure/version.rb +1 -1
- metadata +1 -1
data/History.md
CHANGED
@@ -41,7 +41,7 @@ module Conjure
|
|
41
41
|
prepare_build_directory do |dir|
|
42
42
|
`cd #{dir}; tar czf #{archive} *`
|
43
43
|
server.send_file archive, "dockerfile.tar.gz"
|
44
|
-
server.run "mkdir #{build_dir}; cd #{build_dir}; tar
|
44
|
+
server.run "mkdir #{build_dir}; cd #{build_dir}; tar mxzf ~/dockerfile.tar.gz"
|
45
45
|
result = yield "/tmp/docker_build"
|
46
46
|
server.run "rm -Rf #{build_dir} ~/dockerfile.tar.gz"
|
47
47
|
`rm #{archive}`
|
@@ -33,6 +33,7 @@ module Conjure
|
|
33
33
|
file.run "echo \"ALTER USER db PASSWORD '#{db_password}'\" >/tmp/setpass"
|
34
34
|
file.run "/sbin/my_init -- /sbin/setuser postgres sh -c \"sleep 1; psql -f /tmp/setpass\""
|
35
35
|
file.run "rm /tmp/setpass"
|
36
|
+
file.run "/sbin/my_init -- /sbin/setuser db sh -c \"sleep 1; /usr/bin/createdb #{database_name}\""
|
36
37
|
file
|
37
38
|
end
|
38
39
|
|
@@ -54,9 +55,13 @@ module Conjure
|
|
54
55
|
SecureRandom.urlsafe_base64 20
|
55
56
|
end
|
56
57
|
|
58
|
+
def database_name
|
59
|
+
"#{@app_name}_#{@rails_env}"
|
60
|
+
end
|
61
|
+
|
57
62
|
def database_yml(db_ip_address, db_password)
|
58
63
|
require "yaml"
|
59
|
-
{@rails_env => {"adapter" => "postgresql", "database" =>
|
64
|
+
{@rails_env => {"adapter" => "postgresql", "database" => database_name, "host" => db_ip_address, "username" => "db", "password" => db_password, "template" => "template0"}}.to_yaml
|
60
65
|
end
|
61
66
|
|
62
67
|
def application_conf
|
data/lib/conjure/version.rb
CHANGED