docker-armada 2.13.4 → 2.13.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d6e983153003088a3a585f182746fedce359b270
4
- data.tar.gz: 4901f8a8d6a89e3bba255864d6994399efccbad0
3
+ metadata.gz: 69f07ceab00c267dbcf6c0dffda92133c220de6a
4
+ data.tar.gz: 7369ba0e1db32ba283cae17f151492e7b21823ac
5
5
  SHA512:
6
- metadata.gz: d6631363893189ccd923dfcbb015c3ae874c3e3e7bab13c6e21598e701ce67e79895e056da49083657a02e2eb4be71d31c0a30d3779519765cd7fca963ccc8f9
7
- data.tar.gz: e21a00c577deb155240a95fc5f6314ee9fcd3ce9f6b716757b64feedfa3ef03e5078e9334e9ef738ba909b76cbaf399581a68397d225d4248c06397547cae828
6
+ metadata.gz: 313a74713753471832e2a1a98c6de42fa00ab30cf62ca45ac2859be5704ac3a9b4626e51db778dd7250b14abdb2f4fc7e9227994894093de237683b17605de17
7
+ data.tar.gz: 6542f2cbfdc062ede3097ad7533b3accecbcaacf33cc33a0a690f01c6f0eda6927198183ffe6f2de21e6b0a5e659f9e272abbaa20aa6ac8355c941219b7fc9a7
@@ -69,6 +69,7 @@ module Armada::DeployDSL
69
69
 
70
70
  def container_name(name)
71
71
  set(:container_name, name)
72
+ host_volume "/var/log/containers/#{name}/#{SecureRandom.uuid}", :container_volume => "/home/service/logs"
72
73
  end
73
74
 
74
75
  def env_vars(new_vars)
@@ -12,7 +12,6 @@ module Armada
12
12
 
13
13
  now_in_ns = Integer(Time.now.to_f * 1000000.0)
14
14
  @options[:binds] ||= []
15
- @options[:binds] << "/var/log/containers/#{@name}/#{SecureRandom.uuid}:/home/service/logs"
16
15
  end
17
16
 
18
17
  def stop
@@ -27,7 +26,7 @@ module Armada
27
26
 
28
27
  def start
29
28
  info "Creating new container for image - #{@image.name}:#{@image.tag} with image id (#{@image.id}) with container name #{@name}"
30
- container_config = Armada::Container.create_container_config(@image.name, @name, @docker_host.host, @options)
29
+ container_config = Armada::Container.create_container_config("#{@image.name}:#{@image.tag}", @name, @docker_host.host, @options)
31
30
  begin
32
31
  @container = create(container_config)
33
32
  @id = @container.id
@@ -28,16 +28,6 @@ describe Armada::Container do
28
28
  :host_config => { "StartConfigKey" => "StartConfigValue" },
29
29
  }}
30
30
 
31
- describe "#initialize" do
32
- before { armada_container }
33
-
34
- it "should have the log mount" do
35
- expect(options[:binds]).not_to be_nil
36
- expect(options[:binds].length).to equal 1
37
- expect(options[:binds][0]).to match /^\/var\/log\/containers\/#{container_name}\/.*:\/home\/service\/logs$/
38
- end
39
- end
40
-
41
31
  describe "#stop" do
42
32
  context "when the container exists" do
43
33
  before { docker_host.should_receive(:get_container).and_return(docker_container) }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: docker-armada
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.13.4
4
+ version: 2.13.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonathan Chauncey
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2015-07-30 00:00:00.000000000 Z
13
+ date: 2015-08-03 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: excon