adds docker-compose installation from PyPI.

diff --git a/cookbooks/docker-grid/CHANGELOG.md b/cookbooks/docker-grid/CHANGELOG.md
index 5871c6b..38fe30d 100644 (file)
--- a/cookbooks/docker-grid/CHANGELOG.md
+++ b/cookbooks/docker-grid/CHANGELOG.md
@@ -1,5 +1,9 @@
 # docker-grid CHANGELOG
 
+1.2.0
+-----
+- adds docker-compose installation from PyPI.
+
 1.1.0
 -----
 - deactivates new `docker-ce-stable` yum repository by default.

diff --git a/cookbooks/docker-grid/README.md b/cookbooks/docker-grid/README.md
index be1895f..6466577 100644 (file)
--- a/cookbooks/docker-grid/README.md
+++ b/cookbooks/docker-grid/README.md
@@ -48,7 +48,7 @@ This cookbook sets up Docker engine etc.
 |`['docker-grid']['yum_repo']['baseurl']`|String|for the old repository only.|`'https://yum.dockerproject.org/repo/main/centos/$releasever/'`|
 |`['docker-grid']['yum_repo']['gpgcheck']`|String|for the old repository only. `'0'`: disabled, `'1'`: enabled.|`'1'`|
 |`['docker-grid']['yum_repo']['gpgkey']`|String|for the old repository only.|`'https://yum.dockerproject.org/gpg'`|
-|`['docker-grid']['compose']['install_flavor']`|String|`'dockerproject'` or `'os-repository'`|`'dockerproject'`|
+|`['docker-grid']['compose']['install_flavor']`|String|`'dockerproject'` or `'os-repository'` or `'pypi'`|`'dockerproject'`|
 |`['docker-grid']['compose']['skip_setup']`|Boolean||`false`|
 |`['docker-grid']['compose']['auto_upgrade']`|Boolean|upgrade/reinstall the docker-compose automatically.|`false`|
 |`['docker-grid']['compose']['release_base_url']`|String||`'https://github.com/docker/compose/releases/download/1.9.0'`|

diff --git a/cookbooks/docker-grid/metadata.rb b/cookbooks/docker-grid/metadata.rb
index 2e56418..7c29785 100644 (file)
--- a/cookbooks/docker-grid/metadata.rb
+++ b/cookbooks/docker-grid/metadata.rb
@@ -17,5 +17,5 @@ end
 supports 'debian', '>= 9.0'
 supports 'ubuntu', '>= 14.04'
 
-depends 'platform_utils', '>= 0.4.4'
+depends 'platform_utils', '>= 0.5.0'
 depends 'ssl_cert', '>= 0.4.1'

diff --git a/cookbooks/docker-grid/recipes/compose.rb b/cookbooks/docker-grid/recipes/compose.rb
index 7e83002..27c0aee 100644 (file)
--- a/cookbooks/docker-grid/recipes/compose.rb
+++ b/cookbooks/docker-grid/recipes/compose.rb
@@ -64,4 +64,14 @@ when 'os-repository'
   package 'docker-compose' do
     action :install
   end
+when 'pypi'
+  include_recipe 'platform_utils::pip'
+
+  execute 'pip_install_docker_compose' do
+    user 'root'
+    environment 'HOME' => '/root'
+    command 'pip install docker-compose'
+    action :run
+    not_if 'which docker-compose'
+  end
 end

diff --git a/cookbooks/docker-grid/version b/cookbooks/docker-grid/version
index 9084fa2..26aaba0 100644 (file)
--- a/cookbooks/docker-grid/version
+++ b/cookbooks/docker-grid/version
@@ -1 +1 @@
-1.1.0
+1.2.0