Encapsulate docker-compose in the wheelhouse

README.md

@@ -48,6 +48,16 @@ def start_my_workload():
     # do something with docker
 ```
 
+### Layer Options
+
+##### skip-install
+
+Skips the installation of docker and raises the `docker.available` state. This
+is particularly useful when programming subordinate charms from layer-docker,
+where you know docker is already installed on the host. This allows you to
+skip the potential 90 second install routine, and go straight to deploying
+your application.
+
 ### Docker Compose
 
  This layer installs the 'docker-compose' python package from pypi. So

layer.yaml

@@ -1,4 +1,5 @@
 includes: ['layer:basic']
+repo: https://github.com/juju-solutions/layer-docker.git
 defines:
   skip-install:
     description: Useful when creating docker subordinates, skip the install routine

reactive/docker.py

@@ -48,9 +48,6 @@ def install():
     status_set('active', 'Docker installed, cycling for extensions')
     set_state('docker.ready')
 
-    check_call(['apt-get', 'install', '-y', 'docker-compose'])
-    # Leave a status message that Docker is installed.
-
     # Make with the adding of the users to the groups
     check_call(['usermod', '-aG', 'docker', 'ubuntu'])
 

wheelhouse.txt

@@ -1 +1,2 @@
 charms.docker>=0.0.1,<=2.0.0
+docker-compose>=1.0.0,<=2.0.0