docker-compose-api 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aebb92beffc34f44faf26ba466f17b6c1d792856
-  data.tar.gz: c0c71a9a9d249c3bdefdfaa2396adaf17a6b619c
+  metadata.gz: 6486732a5af8f446379a47c4381086d6c378d123
+  data.tar.gz: bf2845772899790686e19dd67ded50c3dcfad3ca
 SHA512:
-  metadata.gz: 1f4646c618b28def5672fd2bf796ef6da3714bda760173d1f1c434140195f274c09dd70cdf1447f3e3206674ab3dac2e4539305a9bdc93cc149260edfa4f0558
-  data.tar.gz: 9959ca0e28712b31b37d9b1ee5fe84c6736fe33939dc458c1bad3e898d790173f5c451871f479beb27077a331ddc943d592896816e0980b9582957306ddab399
+  metadata.gz: 945430282e47ebba4183b49e84b05de55a645e1660caf91d2def11daf7bcec59297b849140389840a4e7a458e501d95f3983cf9d33d552fe38cdc89616096286
+  data.tar.gz: 24bf2267a1bd1353ce959345f47f4ceda4eec5b5ad9e7f06ef96b1edb27af6e1c5fcadb0814cef05250e6c96813804f5bfa17fc56e2153f6b85fd6eb4ddef15d

data/lib/docker-compose.rb

@@ -55,7 +55,7 @@ module DockerCompose
   def self.load_running_containers(compose)
     Docker::Container
       .all(all: true)
-      .select {|c| c.info['Names'].last.match(/\A\/#{ComposeUtils.dir_name}\w*/) }
+      .select {|c| c.info['Labels']['com.docker.compose.project'] == ComposeUtils.dir_name }
       .each do |container|
         compose.add_container(load_running_container(container))
     end
@@ -64,7 +64,7 @@ module DockerCompose
   def self.create_container(attributes)
     ComposeContainer.new({
       label: attributes[0],
-      name: attributes[1]['container_name'],
+      full_name: attributes[1]['container_name'],
       image: attributes[1]['image'],
       build: attributes[1]['build'],
       links: attributes[1]['links'],

data/lib/docker-compose/models/compose_container.rb

@@ -19,7 +19,9 @@ class ComposeContainer
       command: ComposeUtils.format_command(hash_attributes[:command]),
       environment: prepare_environment(hash_attributes[:environment]),
       labels: prepare_labels(hash_attributes[:labels])
-    }.reject{ |key, value| value.nil? }
+    }.reject { |key, value| value.nil? }
+
+    prepare_compose_labels
 
     # Docker client variables
     @internal_image = nil
@@ -182,6 +184,17 @@ class ComposeContainer
     Hash[labels.map { |label| label.split('=') }]
   end
 
+  #
+  # Adds internal docker-compose labels
+  #
+  def prepare_compose_labels
+    @attributes[:labels] = {} unless @attributes[:labels].is_a?(Hash)
+
+    @attributes[:labels]['com.docker.compose.project'] = ComposeUtils.dir_name
+    @attributes[:labels]['com.docker.compose.service'] = @attributes[:label]
+    @attributes[:labels]['com.docker.compose.oneoff'] = 'False'
+  end
+
   #
   # Check if a given image already exists in host
   #

data/lib/version.rb

@@ -1,5 +1,5 @@
 module DockerCompose
   def self.version
-    "1.1.3"
+    "1.1.4"
   end
 end

data/spec/docker-compose/docker_compose_spec.rb

@@ -244,7 +244,7 @@ describe DockerCompose do
       container.start
 
       env = container.stats['Config']['Labels']
-      expect(env).to eq({ 'com.example.foo' => 'bar' })
+      expect(env['com.example.foo']).to eq('bar')
 
       # Stop container
       container.stop
@@ -257,20 +257,33 @@ describe DockerCompose do
       container.start
 
       env = container.stats['Config']['Labels']
-      expect(env).to eq({ 'com.example.foo' => 'bar' })
+      expect(env['com.example.foo']).to eq('bar')
 
       # Stop container
       container.stop
     end
 
     it 'should assing given name to container' do
+      container = @compose.get_containers_by(label: 'busybox2').first
+
+      # Start container
+      container.start
+
+      container_name = container.stats['Name']
+      expect(container_name).to match(/\/#{ComposeUtils.dir_name}_busybox2_\d+/)
+
+      # Stop container
+      container.stop
+    end
+
+    it 'should assing given container_name to container' do
       container = @compose.get_containers_by(label: 'busybox1').first
 
       # Start container
       container.start
 
       container_name = container.stats['Name']
-      expect(container_name).to match(/\/#{ComposeUtils.dir_name}_busybox-container_\d+/)
+      expect(container_name).to eq('/busybox-container')
 
       # Stop container
       container.stop
@@ -292,7 +305,8 @@ describe DockerCompose do
     it 'should filter containers by its attributes' do
       expect(@compose.get_containers_by(label: 'busybox2')).to eq([@compose.containers['busybox2']])
       expect(@compose.get_containers_by(name: @compose.containers['busybox1'].attributes[:name])).to eq([@compose.containers['busybox1']])
-      expect(@compose.get_containers_by_given_name('busybox-container')).to eq([@compose.containers['busybox1']])
+      expect(@compose.get_containers_by_given_name('busybox2')).to eq([@compose.containers['busybox2']])
+      expect(@compose.get_containers_by(name: 'busybox-container')).to eq([@compose.containers['busybox1']])
       expect(@compose.get_containers_by(image: 'busybox:latest')).to eq([
           @compose.containers['busybox1'],
           @compose.containers['busybox2'],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-compose-api
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Mauricio S. Klein