Skip to content

Allow streaming when using exec #272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow streaming when using exec #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fda1242
Allow streaming when using exec
Intrepidd Apr 4, 2015
0c3b4e9
Re-record cassettes
Apr 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/docker/exec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def start!(options = {}, &block)
# Parse the Options
tty = !!options.delete(:tty)
detached = !!options.delete(:detach)
stdin = options[:stdin]
stdin = options.delete(:stdin)

# Create API Request Body
body = {
Expand All @@ -56,6 +56,9 @@ def start!(options = {}, &block)
}
excon_params = { :body => body.to_json }

opts = {
:stream => true, :stdout => true, :stderr => true
}.merge(options)
msgs = Docker::Messages.new
unless detached
if stdin
Expand All @@ -67,7 +70,7 @@ def start!(options = {}, &block)
end
end

connection.post(path_for(:start), nil, excon_params)
connection.post(path_for(:start), opts, excon_params)
[msgs.stdout_messages, msgs.stderr_messages, self.json['ExitCode']]
end

Expand Down
85 changes: 40 additions & 45 deletions ...l/when_the_HTTP_response_is_a_200/materializes_each_Container_into_a_Docker_Container.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 30 additions & 31 deletions spec/vcr/Docker_Container/_attach/with_normal_sized_chunks/yields_each_chunk.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading