capistrano-docker-compose 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f948091c0dcfdef9e8ed7404ac67b4db3b2d6332
-  data.tar.gz: 1008f6236e835522c0b03db4aea307536d23c0c7
+  metadata.gz: c309bf938b62b19da661f3c67206bf67ac201619
+  data.tar.gz: e9921eebbf00477019f64e17574fd5534ab7b60b
 SHA512:
-  metadata.gz: ff91f069c9c0ddc6dd7a2fffbec755420ffa90f696ddc9f76f53b965dc5b5fd4eb6a3b24ed592fd0e8b4f3ab291e3574d77c4420cf2368974226b89cba6c99dd
-  data.tar.gz: df89b9b60d50222d928f34d683af932e6014c50c1bec52a89a517923f49cf5075dbae3981838bb49894303b0743ac09f25c5df75ee3b5e35ac5e9c1e203c540f
+  metadata.gz: b471c2559ca3a7a8419052bfe5c7fe378fe357df3a49fb86ae780a49b4fc5ad571006f05eb823305afb5b90f533331611ba8f9fe92b5cf96b797f2814b6fdd74
+  data.tar.gz: fec4895fa2d43e0951bee4cd65924be5da5715a70112fab79c1ae279dbdcc82e6de7d8ec6a0a124899446a2df27c4945f472050eba549e584ad15c0642ee80de

data/README.md

@@ -1,4 +1,4 @@
-# Capistrano::Docker::Compose
+# Capistrano::Docker::Compose [![Build Status](https://travis-ci.org/interactive-pioneers/capistrano-docker-compose.svg?branch=master)](https://travis-ci.org/interactive-pioneers/capistrano-docker-compose) [![Gem Version](https://badge.fury.io/rb/capistrano-docker-compose.svg)](https://badge.fury.io/rb/capistrano-docker-compose)
 
 Docker Compose specific tasks for Capistrano allowing seamless zero downtime containerised deployments.
 
@@ -33,6 +33,13 @@ Create Docker Compose descriptors for each environment leaving `docker-compose.y
   - `docker-compose-staging.yml`
   - `docker-compose-production.yml`
 
+Make Compose YAML dynamic with following environment variables:
+
+- `CAP_DOCKER_COMPOSE_ROOT_PATH` for shared path
+- `CAP_DOCKER_COMPOSE_PORT` for port range
+
+See also [Compose YAML example](https://github.com/interactive-pioneers/capistrano-docker-compose/blob/master/docker-compose-staging.example.yml).
+
 Add `capistrano-docker-compose` to `Capfile`:
 
 ``` ruby
@@ -40,18 +47,25 @@ Add `capistrano-docker-compose` to `Capfile`:
 require 'capistrano/docker/compose'
 ```
 
-You can configure following Docker Compose specific options in `config/deploy.rb` and/or `config/deploy/<environment>.rb`:
+Configure following Docker Compose specific options in `config/deploy.rb` and/or `config/deploy/<environment>.rb`:
 
 ```ruby
-# User name when running the Docker image (reflecting Docker's USER instruction)
-# Example: set :docker_compose_user, 'pioneer'
-set :docker_compose_user, '<username>'
-
 # Define port range in respect to load balancer on server
 # If 2 or more environments reside on same server, configure port range as per environment
 # Ruby's Range object is expected, see http://ruby-doc.org/core-2.3.0/Range.html
 # Example: set :docker_compose_port_range, 2070..2071
 set :docker_compose_port_range, <port>..<port>
+
+# OPTIONAL
+# User name when running the Docker image (reflecting Docker's USER instruction)
+# Example: set :docker_compose_user, 'pioneer'
+set :docker_compose_user, '<username>'
+
+# OPTIONAL
+# Roles considered
+# Defaults to :all
+# Example: set :docker_compose_roles, :web
+set :docker_compose_roles, <roles>
 ```
 
 Configure load balancer with port range defined in `docker_compose_port_range`, see [example configuration](https://github.com/interactive-pioneers/capistrano-docker-compose/blob/master/haproxy.example.cfg).

data/docker-compose-staging.example.yml

@@ -0,0 +1,14 @@
+version: '2'
+services:
+  web:
+    image: ipioneers/passenger-ruby:2.3
+    expose:
+      - 80
+    volumes:
+      - .:/home/app
+      - ../../shared:${CAP_DOCKER_COMPOSE_ROOT_PATH}/shared
+    ports:
+      - "${CAP_DOCKER_COMPOSE_PORT}:80"
+    environment:
+      - RAILS_ENV=staging
+      - PASSENGER_APP_ENV=staging

data/lib/capistrano/docker/compose/version.rb

@@ -1,7 +1,7 @@
 module Capistrano
   module Docker
     module Compose
-      VERSION = "0.1.0"
+      VERSION = "0.1.1"
     end
   end
 end

data/lib/capistrano/docker/tasks/compose.rake

@@ -1,11 +1,17 @@
-SSHKit.config.command_map.prefix[:bundle].push("docker-compose exec web")
+# Rewire key commands to container
+%i(bundle rake).map do |command|
+  # FIXME: replace hard-coded web service with master service setting
+  # https://github.com/interactive-pioneers/capistrano-docker-compose/issues/7
+  SSHKit.config.command_map.prefix[command].push("docker-compose exec web")
+end
 
 namespace :deploy do
 
   set :previous_release_path, nil
+  set :docker_compose_roles, :all
 
   task :pull_images do
-    on roles(:docker), in: :groups, limit: 3, wait: 10 do
+    on roles(fetch(:docker_compose_roles)) do
       within release_path do
         execute :'docker-compose', 'pull'
         # TODO: confirm successful pull
@@ -14,7 +20,7 @@ namespace :deploy do
   end
 
   task :start_containers do
-    on roles(:docker) do
+    on roles(fetch(:docker_compose_roles)) do
       set :previous_release_path, previous_release
       within release_path do
         with cap_docker_compose_root_path: fetch(:deploy_to), cap_docker_compose_port: detect_available_port do
@@ -27,7 +33,7 @@ namespace :deploy do
   task :claim_files_by_container do
     user = fetch(:docker_compose_user)
     unless user.nil?
-      on roles(:docker) do
+      on roles(fetch(:docker_compose_roles)) do
         within release_path do
           execute :'docker-compose', 'exec', 'web', 'chown', '-R', "#{user}:#{user}", '.'
         end
@@ -36,7 +42,7 @@ namespace :deploy do
   end
 
   task :purge_old_containers do
-    on roles(:docker) do
+    on roles(fetch(:docker_compose_roles)) do
       if fetch(:previous_release_path)
         info "Purging previous release containers at #{fetch(:previous_release_path)}"
         within fetch(:previous_release_path) do
@@ -47,7 +53,7 @@ namespace :deploy do
   end
 
   task :purge_failed_containers do
-    on roles(:docker) do
+    on roles(fetch(:docker_compose_roles)) do
       within release_path do
         execute :'docker-compose', 'down'
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-docker-compose
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ain Tohvri
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -82,6 +82,7 @@ files:
 - README.md
 - Rakefile
 - capistrano-docker-compose.gemspec
+- docker-compose-staging.example.yml
 - haproxy.example.cfg
 - lib/capistrano-docker-compose.rb
 - lib/capistrano/docker.rb