Merge lp:~samuel-cozannet/charms/trusty/docker-compose/dev into lp:~zoology/charms/trusty/docker-compose/trunk

[Samuel Cozannet]

Hi LazyPower,

This branch fixes the problem of config, and adds auto-opening ports on the host, as well as management of Swarm Clusters.

I also added an example to run it on Swarm.

++
Sam

[Charles Butler (lazypower)]

+1 LGTM with this particular implementation.

I think we should move the docker-compose version identifier to config.yaml and let user config drive that, so the end user isn't blocked on us updating the charm. Otherwise LGTM

Thanks for the contribution Sam! Big thanks for the README updates, and the port-openening code. This is the first time i've seen shyaml, looks nifty.

review: Approve

=== modified file 'README.md'
--- README.md	2015-06-18 18:31:28 +0000
+++ README.md	2015-11-10 14:39:49 +0000
@@ -8,11 +8,11 @@
 Ensure you have a docker-cluster running complete with the registrator charm:
 
     juju deploy docker
-    juju deploy registrator
-    juju deploy consul
+    juju deploy cs:~zoology/trusty/registrator registrator
+    juju deploy cs:~zoology/trusty/consul consul
     juju deploy nginx-proxy
     juju add-relation registrator docker
-    juju add-relation registrator:api consul:api
+    juju add-relation registrator:consul-api consul:api
     juju add-relation nginx-proxy:template consul:api
 
 Using the example of deploying the 2048 HTML5 game running in a docker container:
@@ -21,9 +21,32 @@
     juju set twentry-fourty-eight repository=https://github.com/chuckbutler/docker-demos.git path=2048
     juju add-relation twenty-fourty-eight docker
 
+## Scale out usage
+
+Scaling out in the case of Docker means using a Docker Cluster, which can be achieved with Swarm. 
+
+    juju deploy -n3 --constraints "mem=4G cpu-cores=4 root-disk=32G" cs:~lazypower/trusty/swarm
+    juju deploy -n3 etcd
+    juju add-relation swarm etcd
+
+Now you can deploy a RabbitMQ server encapsulated as a docker container: 
+
+    juju deploy cs:~lazypower/trustydocker-compose rabbitmq
+    juju set rabbitmq repository=https://github.com/SaMnCo/docker-app.git path=rabbitmq/templates
+    juju add-relation rabbitmq swarm
+    juju expose rabbitmq
+
 ## Known Limitations and Issues
 
-[todo]
+### Connecting to containerized apps
+
+In the current design it's not possible to relate two containers together, or an app deployed via Juju to a containerized app. 
+
+To connect to a container you have to use the Juju command
+
+    juju status --format tabular
+
+And look at IP addresses and ports. 
 
 # Configuration
 
@@ -31,5 +54,7 @@
 
 # Contact Information
 
-[todo]
+Charles Butler (LazyPower) <[e-mail]>
+Samuel Cozannet (SaMnCo) <[e-mail]>
+
 

=== modified file 'config.yaml'
--- config.yaml	2015-06-18 18:31:28 +0000
+++ config.yaml	2015-11-10 14:39:49 +0000
@@ -1,7 +1,7 @@
 options:
   repository:
     type: string
-    default: https://github.com/chuckbutler/docker-demos
+    default: 
     description: "repository to clone that holds the docker-compose.yaml or fig.yaml"
   path:
     type: string

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-06-18 18:31:28 +0000
+++ hooks/config-changed	2015-11-10 14:39:49 +0000
@@ -1,14 +1,14 @@
 #!/bin/bash
-# config-changed occurs everytime a new configuration value is updated (juju set)
-
 set -ex
 
 COMPOSE_REPO=$(config-get repository)
 COMPOSE_PATH=$(config-get path)
 COMPOSE_ARGS=$(config-get arguments)
 
+IS_SWARM_CLUSTER=$(docker ps | grep "swarm" | wc -l)
+IS_SWARM_MASTER=$(docker ps | grep "swarm" | grep "manage" | wc -l)
 
-if [ -z $COMPOSE_REPO ]; then
+if [ -z ${COMPOSE_REPO} ]; then
     juju-log "Missing repository. Doing nothing"
     status-set blocked "Missing repository config"
     exit 0
@@ -29,12 +29,27 @@
     cd $COMPOSE_PATH
 fi
 
-docker-compose pull
-docker-compose build
+# We execute only if we are on a standalone docker node or on the swarm master
+if [[ ${IS_SWARM_CLUSTER} -lt 1 || ${IS_SWARM_MASTER} -eq 1 ]]; then
+	docker-compose pull
+	docker-compose build
 
-if [ -z $COMPOSE_ARGS ]; then
-    docker-compose up -d
-else
-    docker-compose $COMPOSE_ARGS
+	if [ -z $COMPOSE_ARGS ]; then
+	    docker-compose up -d
+	else
+	    docker-compose $COMPOSE_ARGS
+	fi
 fi
 
+# Now as we can't predict where the container will be we open all ports on all machines
+WORKLOADS=$(cat docker-compose.yml | shyaml keys)
+PORTS=""
+for workload in ${WORKLOADS}; do
+	PORTS="${PORTS} $(cat docker-compose.yml | shyaml get-values ${workload}.ports | cut -f1 -d':')"
+done
+
+for port in ${PORTS}; do 
+	open-port ${port}
+done
+
+exit 0
\ No newline at end of file

=== modified file 'hooks/install'
--- hooks/install	2015-06-18 21:10:49 +0000
+++ hooks/install	2015-11-10 14:39:49 +0000
@@ -1,14 +1,10 @@
 #!/bin/bash
-# Here do anything needed to install the service
-# i.e. apt-get install -y foo  or  bzr branch http://myserver/mycode /srv/webroot
-# Make sure this hook exits cleanly and is idempotent, common problems here are
-# failing to account for a debconf question on a dependency, or trying to pull
-# from github without installing git firstw
 
 COMPOSE_INSTALLED=$(which docker-compose)
 
 if [ -z $COMPOSE_INSTALLED ]; then
-    pip install --upgrade docker-compose==1.2.0
+    pip install --upgrade docker-compose==1.5.0
 fi
 
 apt-get install -y git
+pip install --upgrade shyaml
\ No newline at end of file

=== modified file 'hooks/stop'
--- hooks/stop	2015-06-18 18:31:28 +0000
+++ hooks/stop	2015-11-10 14:39:49 +0000
@@ -1,5 +1,4 @@
 #!/bin/bash
-# config-changed occurs everytime a new configuration value is updated (juju set)
 
 COMPOSE_REPO=$(config-get repository)
 COMPOSE_PATH=$(config-get path)
@@ -18,4 +17,3 @@
 docker compose rm
 cd $CHARM_DIR
 rm -rf compose_app
-

=== added file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	1970-01-01 00:00:00 +0000
+++ hooks/upgrade-charm	2015-11-10 14:39:49 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+hooks/stop
+
+hooks/config-changed
+