docker-rails 0.5.5 → 0.5.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +3 -1
- data/lib/docker/rails/app.rb +4 -1
- data/lib/docker/rails/cli/main.rb +1 -1
- data/lib/docker/rails/ext/container.rb +2 -3
- data/lib/docker/rails/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2ffcac9672d5ba6fa9dbc6dfe46fcd5bc1c59e12
|
4
|
+
data.tar.gz: 6b99bcd91aeb6f31749204808501ba4c8904afeb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 1d9b1f9dc1f4f504581cdcd176562e8d636ce3c8ac85001e2ab3d3a83dd7973a7cce9f201a6a9fd4b21dd321c586c4f73c92372149ed6edc30497f0eae7b3c75
|
7
|
+
data.tar.gz: f3a0e5b27b2d01ee13677c14d1a80dd88fabeb4e4c81471bd3617c87a0e34a738e297835d6409a7129876ce3e8f31c631f7c3f6a439f991b1da8f24cf3393a0b
|
data/README.md
CHANGED
@@ -153,8 +153,10 @@ extractions: &extractions
|
|
153
153
|
extract:
|
154
154
|
- '/project/target'
|
155
155
|
- '/project/vcr'
|
156
|
-
- '/project/tmp'
|
157
156
|
- '/project/spec/dummy/log:spec/dummy'
|
157
|
+
- '/project/tmp/parallel_runtime_cucumber.log:./tmp'
|
158
|
+
- '/project/tmp/parallel_runtime_rspec.log:./tmp'
|
159
|
+
|
158
160
|
|
159
161
|
# local environments need elasticsearch, staging/production connects to existing running instance.
|
160
162
|
elasticsearch: &elasticsearch
|
data/lib/docker/rails/app.rb
CHANGED
@@ -69,6 +69,9 @@ module Docker
|
|
69
69
|
# - '/project/vcr' # same as extract to '.'
|
70
70
|
# - '/project/tmp'
|
71
71
|
# - '/project/spec/dummy/log:spec/dummy'
|
72
|
+
# - '/project/tmp/parallel_runtime_cucumber.log:./tmp'
|
73
|
+
# - '/project/tmp/parallel_runtime_rspec.log:./tmp'
|
74
|
+
|
72
75
|
@compose_config.each_key do |service_name|
|
73
76
|
service_config = @config[service_name]
|
74
77
|
extractions = service_config[:extract] unless service_config.nil?
|
@@ -136,7 +139,7 @@ module Docker
|
|
136
139
|
exec_compose 'up', false, options #unless skip? :up
|
137
140
|
end
|
138
141
|
|
139
|
-
def
|
142
|
+
def compose_build
|
140
143
|
# Run the compose configuration
|
141
144
|
exec_compose 'build'
|
142
145
|
end
|
@@ -78,7 +78,7 @@ module Docker
|
|
78
78
|
|
79
79
|
def build(target)
|
80
80
|
invoke :compose
|
81
|
-
App.configured(target, options).
|
81
|
+
App.configured(target, options).compose_build
|
82
82
|
end
|
83
83
|
|
84
84
|
desc 'compose <target>', 'Writes a resolved docker-compose.yml file e.g. bundle exec docker-rails compose --build=222 test'
|
@@ -1,5 +1,6 @@
|
|
1
1
|
class Docker::Container
|
2
2
|
|
3
|
+
#FIXME: remove this method when pull #321 is accepted
|
3
4
|
# Update the @info hash, which is the only mutable state in this object.
|
4
5
|
def refresh!
|
5
6
|
other = Docker::Container.all({all: true}, connection).find { |c|
|
@@ -15,9 +16,7 @@ class Docker::Container
|
|
15
16
|
# info is cached, return the first one otherwise retrieve a new container and get the status from it
|
16
17
|
refresh!
|
17
18
|
|
18
|
-
|
19
|
-
puts status
|
20
|
-
status
|
19
|
+
info['Status']
|
21
20
|
end
|
22
21
|
|
23
22
|
def name
|
data/lib/docker/rails/version.rb
CHANGED