Skip to content

Commit

Permalink
upgrade to v12
Browse files Browse the repository at this point in the history
  • Loading branch information
@laferrieren
laferrieren committed Nov 1, 2015
1 parent 70f11a0 commit 62d5cd3
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
16 changes: 8 additions & 8 deletions lib/centurion/docker_via_api.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def initialize(hostname, port, tls_args = {})
end

def ps(options={})
path = "/v1.7" + "/containers/json"
path = "/v1.12" + "/containers/json"
path += "?all=1" if options[:all]
response = Excon.get(@base_uri + path, tls_excon_arguments)

Expand All @@ -24,7 +24,7 @@ def ps(options={})

def inspect_image(image, tag = "latest")
repository = "#{image}:#{tag}"
path = "/v1.7" + "/images/#{repository}/json"
path = "/v1.12" + "/images/#{repository}/json"

response = Excon.get(
@base_uri + path,
Expand All @@ -35,7 +35,7 @@ def inspect_image(image, tag = "latest")
end

def remove_container(container_id)
path = "/v1.7" + "/containers/#{container_id}"
path = "/v1.12" + "/containers/#{container_id}"
response = Excon.delete(
@base_uri + path,
tls_excon_arguments
Expand All @@ -45,7 +45,7 @@ def remove_container(container_id)
end

def stop_container(container_id, timeout = 30)
path = "/v1.7" + "/containers/#{container_id}/stop?t=#{timeout}"
path = "/v1.12" + "/containers/#{container_id}/stop?t=#{timeout}"
response = Excon.post(
@base_uri + path,
tls_excon_arguments
Expand All @@ -55,7 +55,7 @@ def stop_container(container_id, timeout = 30)
end

def create_container(configuration, name = nil)
path = "/v1.10" + "/containers/create"
path = "/v1.12" + "/containers/create"
response = Excon.post(
@base_uri + path,
tls_excon_arguments.merge(
Expand All @@ -69,7 +69,7 @@ def create_container(configuration, name = nil)
end

def start_container(container_id, configuration)
path = "/v1.10" + "/containers/#{container_id}/start"
path = "/v1.12" + "/containers/#{container_id}/start"
response = Excon.post(
@base_uri + path,
tls_excon_arguments.merge(
Expand All @@ -88,7 +88,7 @@ def start_container(container_id, configuration)
end

def restart_container(container_id, timeout = 30)
path = "/v1.10" + "/containers/#{container_id}/restart?t=#{timeout}"
path = "/v1.12" + "/containers/#{container_id}/restart?t=#{timeout}"
response = Excon.post(
@base_uri + path,
tls_excon_arguments
Expand All @@ -106,7 +106,7 @@ def restart_container(container_id, timeout = 30)
end

def inspect_container(container_id)
path = "/v1.7" + "/containers/#{container_id}/json"
path = "/v1.12" + "/containers/#{container_id}/json"
response = Excon.get(
@base_uri + path,
tls_excon_arguments
Expand Down
48 changes: 24 additions & 24 deletions spec/docker_via_api_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@

it 'lists processes' do
expect(Excon).to receive(:get).
with(excon_uri + 'v1.7/containers/json', {}).
with(excon_uri + 'v1.12/containers/json', {}).
and_return(double(body: json_string, status: 200))
expect(api.ps).to eq(json_value)
end

it 'lists all processes' do
expect(Excon).to receive(:get).
with(excon_uri + 'v1.7/containers/json?all=1', {}).
with(excon_uri + 'v1.12/containers/json?all=1', {}).
and_return(double(body: json_string, status: 200))
expect(api.ps(all: true)).to eq(json_value)
end
Expand All @@ -29,7 +29,7 @@
configuration_as_json = double
configuration = double(to_json: configuration_as_json)
expect(Excon).to receive(:post).
with(excon_uri + "v1.10" + "/containers/create",
with(excon_uri + "v1.12" + "/containers/create",
query: nil,
body: configuration_as_json,
headers: {'Content-Type' => 'application/json'}).
Expand All @@ -41,7 +41,7 @@
configuration_as_json = double
configuration = double(to_json: configuration_as_json)
expect(Excon).to receive(:post).
with(excon_uri + "v1.10" + "/containers/create",
with(excon_uri + "v1.12" + "/containers/create",
query: { name: match(/^app1-[a-f0-9]+$/) },
body: configuration_as_json,
headers: {'Content-Type' => 'application/json'}).
Expand All @@ -53,7 +53,7 @@
configuration_as_json = double
configuration = double(to_json: configuration_as_json)
expect(Excon).to receive(:post).
with(excon_uri + "v1.10" + "/containers/12345/start",
with(excon_uri + "v1.12" + "/containers/12345/start",
body: configuration_as_json,
headers: {'Content-Type' => 'application/json'}).
and_return(double(body: json_string, status: 204))
Expand All @@ -62,49 +62,49 @@

it 'stops a container' do
expect(Excon).to receive(:post).
with(excon_uri + 'v1.7/containers/12345/stop?t=300', {}).
with(excon_uri + 'v1.12/containers/12345/stop?t=300', {}).
and_return(double(status: 204))
api.stop_container('12345', 300)
end

it 'stops a container with a custom timeout' do
expect(Excon).to receive(:post).
with(excon_uri + 'v1.7/containers/12345/stop?t=30', {}).
with(excon_uri + 'v1.12/containers/12345/stop?t=30', {}).
and_return(double(status: 204))
api.stop_container('12345')
end

it 'restarts a container' do
expect(Excon).to receive(:post).
with(excon_uri + "v1.10" + "/containers/12345/restart?t=30", {}).
with(excon_uri + "v1.12" + "/containers/12345/restart?t=30", {}).
and_return(double(body: json_string, status: 204))
api.restart_container('12345')
end

it 'restarts a container with a custom timeout' do
expect(Excon).to receive(:post).
with(excon_uri + "v1.10" + "/containers/12345/restart?t=300", {}).
with(excon_uri + "v1.12" + "/containers/12345/restart?t=300", {}).
and_return(double(body: json_string, status: 204))
api.restart_container('12345', 300)
end

it 'inspects a container' do
expect(Excon).to receive(:get).
with(excon_uri + 'v1.7/containers/12345/json', {}).
with(excon_uri + 'v1.12/containers/12345/json', {}).
and_return(double(body: json_string, status: 200))
expect(api.inspect_container('12345')).to eq(json_value)
end

it 'removes a container' do
expect(Excon).to receive(:delete).
with(excon_uri + 'v1.7/containers/12345', {}).
with(excon_uri + 'v1.12/containers/12345', {}).
and_return(double(status: 204))
expect(api.remove_container('12345')).to eq(true)
end

it 'inspects an image' do
expect(Excon).to receive(:get).
with(excon_uri + "v1.7" + "/images/foo:bar/json",
with(excon_uri + "v1.12" + "/images/foo:bar/json",
headers: {'Accept' => 'application/json'}).
and_return(double(body: json_string, status: 200))
expect(api.inspect_image('foo', 'bar')).to eq(json_value)
Expand All @@ -120,7 +120,7 @@

it 'lists processes' do
expect(Excon).to receive(:get).
with(excon_uri + 'v1.7/containers/json',
with(excon_uri + 'v1.12/containers/json',
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem').
and_return(double(body: json_string, status: 200))
Expand All @@ -129,7 +129,7 @@

it 'lists all processes' do
expect(Excon).to receive(:get).
with(excon_uri + 'v1.7/containers/json?all=1',
with(excon_uri + 'v1.12/containers/json?all=1',
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem').
and_return(double(body: json_string, status: 200))
Expand All @@ -138,7 +138,7 @@

it 'inspects an image' do
expect(Excon).to receive(:get).
with(excon_uri + 'v1.7/images/foo:bar/json',
with(excon_uri + 'v1.12/images/foo:bar/json',
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem',
headers: {'Accept' => 'application/json'}).
Expand All @@ -150,7 +150,7 @@
configuration_as_json = double
configuration = double(to_json: configuration_as_json)
expect(Excon).to receive(:post).
with(excon_uri + 'v1.10/containers/create',
with(excon_uri + 'v1.12/containers/create',
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem',
query: nil,
Expand All @@ -164,7 +164,7 @@
configuration_as_json = double
configuration = double(to_json: configuration_as_json)
expect(Excon).to receive(:post).
with(excon_uri + 'v1.10/containers/12345/start',
with(excon_uri + 'v1.12/containers/12345/start',
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem',
body: configuration_as_json,
Expand All @@ -175,7 +175,7 @@

it 'stops a container' do
expect(Excon).to receive(:post).
with(excon_uri + 'v1.7/containers/12345/stop?t=300',
with(excon_uri + 'v1.12/containers/12345/stop?t=300',
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem').
and_return(double(status: 204))
Expand All @@ -184,7 +184,7 @@

it 'stops a container with a custom timeout' do
expect(Excon).to receive(:post).
with(excon_uri + 'v1.7/containers/12345/stop?t=30',
with(excon_uri + 'v1.12/containers/12345/stop?t=30',
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem').
and_return(double(status: 204))
Expand All @@ -193,7 +193,7 @@

it 'restarts a container' do
expect(Excon).to receive(:post).
with(excon_uri + "v1.10" + "/containers/12345/restart?t=30",
with(excon_uri + "v1.12" + "/containers/12345/restart?t=30",
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem').
and_return(double(body: json_string, status: 204))
Expand All @@ -202,7 +202,7 @@

it 'restarts a container with a custom timeout' do
expect(Excon).to receive(:post).
with(excon_uri + "v1.10" + "/containers/12345/restart?t=300",
with(excon_uri + "v1.12" + "/containers/12345/restart?t=300",
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem').
and_return(double(body: json_string, status: 204))
Expand All @@ -211,7 +211,7 @@

it 'inspects a container' do
expect(Excon).to receive(:get).
with(excon_uri + 'v1.7/containers/12345/json',
with(excon_uri + 'v1.12/containers/12345/json',
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem').
and_return(double(body: json_string, status: 200))
Expand All @@ -220,7 +220,7 @@

it 'removes a container' do
expect(Excon).to receive(:delete).
with(excon_uri + 'v1.7/containers/12345',
with(excon_uri + 'v1.12/containers/12345',
client_cert: '/certs/cert.pem',
client_key: '/certs/key.pem').
and_return(double(status: 204))
Expand All @@ -235,7 +235,7 @@

it 'lists processes' do
expect(Excon).to receive(:get).
with(excon_uri + 'v1.7/containers/json',
with(excon_uri + 'v1.12/containers/json',
client_cert: File.expand_path('~/.docker/cert.pem'),
client_key: File.expand_path('~/.docker/key.pem')).
and_return(double(body: json_string, status: 200))
Expand Down

0 comments on commit 62d5cd3

Please sign in to comment.