dockerploy 0.0.4 → 0.0.5

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2YyODBjNmEwZGZhMmY5MDZjNDMyZGUxZGQ0MmVkYmY0M2I0YWJlZg==
+    NGFjZGYwZmU4ZDE1MTMzYWI1MTg3MzkzOWZmOTUxMzRkNDQ0ZWE1NQ==
   data.tar.gz: !binary |-
-    NDYyMTM0MDVlZGJkNTA2OTA4YTk2YzZiMmRkMmEzMzdmMTVjYjk4Mg==
+    NTZmMThhYTUxZjMyYTRjNTMzODAwZDk2YTIzNzExMTFmNWJlMWM5ZA==
 SHA512:
   metadata.gz: !binary |-
-    N2ZmMGM1YTg5MjBmMWEzYzQxNzdhOGUzZjE5YmQ1ODBmMjYzNmIwZGQzMjYz
-    Mjg0MTM2OWRkODA5ZWE1OWJjMzkxZGQwNjJmMDBmMTdiMjBiMGNlMWY0OTdi
-    NWVjYWUyMTA4YTEzMTlmYjI4YTg3N2E3NjI1MzhiNjE2YWZiOWE=
+    YTI3YjJlN2U1YTNjMzFlMTkyNmUwYjQ1Yzg2NzVlODY1MTg4OGI4ODVlY2I1
+    MzRjMmE2NTIwMjgyNmE0YWFkYjk3ODZkY2EzMTM1NTk5NzUwYTUxMWYyMmYy
+    ZDg2ZGIzYzVmMGRiMzE1ODMxNTAwYzZhM2MyZTAxNDgxNWQxZTU=
   data.tar.gz: !binary |-
-    Njc1YjZiNTRkYjNmNzg1YzVjODYyZDY2ODBkNDlhNTEwMTJjOTkzMzc3NDkx
-    MGVjZDA3ODY2NDk1NDdkNzcxMjJkNjgyZTQ4NGUzZDZkODM4ZmU5ZGE1NzRm
-    MjAyN2E3MTIwMThjMjk2NjQ3ZGM3OGE5Zjc5ODE2YTNkM2UwOGM=
+    MmM3NzIzNWMwYmRmMjVlMGM2Y2U5YmU1NmM5YTI1NmEyODYwNGY4OWVlOGQ2
+    ZjBkNzE5YTIxY2U4ZDI5M2UxZWNmNzdiYjQxODg3NzNlMmEzMGRlYTMwODVm
+    MTBlNDljYWVmNGFkMzViOGIwMjY1ZTJiMWU3NGY2OGY3ZGNhNTY=

data/README.md

@@ -7,7 +7,11 @@ Deploy dockerized an application
 
 Add this line to your application's Gemfile:
 
-    gem 'dockerploy'
+```ruby
+    group :development do
+      gem 'dockerploy'
+    end
+```
 
 And then execute:
 
@@ -17,6 +21,47 @@ Or install it yourself as:
 
     $ gem install dockerploy
 
+Generate an empty docker/config.yml with:
+
+    $ bundle exec dockerploy init
+
+## Configuration
+In docker/config.yml.
+
+    image_name: <Docker image name>
+    docker_username: <Docker registry server username>
+    docker_host: <Docker server for building>
+    application_name: <application name>
+    staging: # Environment name
+      env_file: docker/environments/staging.yml # Environment variable file path
+      tag: v1.0.7 # <Image tag>
+      hooks:
+        before_deploy:
+          - local:
+            - <Command to run in local machine>
+          - remote:
+            - <Command to run in remove machine(host server)>
+        after_deploy:
+          - local:
+            - <Command to run in local machine>
+          - remote:
+            - <Command to run in remove machine(host server)>
+      volumes:
+        - volume:
+            host: <Folder from the host>
+            guest: <Folder to the container>
+      servers:
+        - host: <Docker server>
+          username: <Server username>
+          password: <Server password>
+          port: <Server SSH port>
+          custom_variables:
+            role: <Server SSH port>
+          container:
+            host: <Container host>
+            ssh_port: <Container ssh port for mapping>
+            http_port: <Container http port for mapping>
+
 ## Usage
 To build an image
 

data/lib/dockerploy/configuration.rb

@@ -42,6 +42,11 @@ module Dockerploy
       options[@env][:tagging]
     end
 
+    def image_tag
+      raise NoEnvError if @env.nil?
+      options[@env][:image_tag]
+    end
+
     def before_all_hooks
       return {} if options[:hooks].nil? || options[:hooks][:before_deploy].nil?
       options[:hooks][:before_deploy]

data/lib/dockerploy/deploy.rb

@@ -112,7 +112,8 @@ module Dockerploy
     end
 
     def image_name
-      @options[:tag] ? sprintf('%s:%s', @config.image_name, @options[:tag]) : @config.image_name
+      tag = @options[:tag] || @config.image_tag
+      tag ? sprintf('%s:%s', @config.image_name, tag) : @config.image_name
     end
   end
 end

data/lib/dockerploy/version.rb

@@ -1,4 +1,4 @@
 module Dockerploy
   # Version of Dockerploy
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/spec/fixtures/config_with_image_tag.yml

@@ -0,0 +1,17 @@
+image_name: docker/image
+docker_username: dockeruser
+docker_host: tcp://test.host:4243
+application_name: app
+test:
+  branch: test-branch
+  image_tag: v1.0.1
+  servers:
+    - host: server.host
+      username: server_user
+      password: server_pass
+      port: 2000
+      role: server_role
+      container:
+        host: container.host
+        ssh_port: 1022
+        http_port: 8080

data/spec/lib/dockerploy/deploy_spec.rb

@@ -143,6 +143,19 @@ docker run -d --name app_8080 --hostname app -p container.host:1022:22 -p contai
           subject.deploy
         end
       end
+
+      context 'with image_tag' do
+        let(:fixture_path) { 'spec/fixtures/config_with_image_tag.yml' }
+
+        it 'creates a container with image tag' do
+          expected_command = <<-SHELL
+docker run -d --name app_8080 --hostname app -p container.host:1022:22 -p container.host:8080:80   docker/image:v1.0.1
+          SHELL
+          expected_command.chomp!
+          expect(ssh_client).to receive(:command).with(expected_command).ordered
+          subject.deploy
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dockerploy
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Sunjin Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -144,6 +144,7 @@ files:
 - spec/fixtures/config_with_env_file.yml
 - spec/fixtures/config_with_hooks.yml
 - spec/fixtures/config_with_hooks_for_each_env.yml
+- spec/fixtures/config_with_image_tag.yml
 - spec/fixtures/config_with_tagging.yml
 - spec/fixtures/config_with_volumes.yml
 - spec/fixtures/test.yml
@@ -182,6 +183,7 @@ test_files:
 - spec/fixtures/config_with_env_file.yml
 - spec/fixtures/config_with_hooks.yml
 - spec/fixtures/config_with_hooks_for_each_env.yml
+- spec/fixtures/config_with_image_tag.yml
 - spec/fixtures/config_with_tagging.yml
 - spec/fixtures/config_with_volumes.yml
 - spec/fixtures/test.yml