lib/dockly/build_cache/docker.rb in dockly-2.0.0 vs lib/dockly/build_cache/docker.rb in dockly-2.0.1
- old
+ new
@@ -1,12 +1,8 @@
class Dockly::BuildCache::Docker < Dockly::BuildCache::Base
attr_accessor :image
- def wait_time
- 300 # max 5 minutes
- end
-
def execute!
ensure_present! :image
super
image
end
@@ -90,10 +86,10 @@
def run_command(command)
debug "running command `#{command}` on image #{image.id}"
container = image.run(["/bin/bash", "-c", "cd #{command_directory} && #{command}"])
debug "command running in container #{container.id}"
- status = container.wait(wait_time)['StatusCode']
+ status = container.wait(docker.timeout)['StatusCode']
resp = container.streaming_logs(stdout: true, stderr: true)
debug "`#{command}` returned the following output:"
debug resp.strip
debug "`#{command}` exited with status #{status}, resulting container id: #{container.id}"
[status, resp.strip, container]