make the control_path pattern change for each build. make codeship-st…

…eps.yml syntax simpler

codeship-steps.yml

@@ -14,8 +14,12 @@
   - name: "Deploy"
     service: deploy
     tag: develop
-    command: "ansible-playbook -vv -i hosts/rackspace_staging platform-api-update.yml -e=\"PLATFORM_CLIENT_VERSION=$CI_COMMIT_ID\""
+    command: >
+      ansible-playbook -vv -i hosts/rackspace_staging platform-api-update.yml
+        -e PLATFORM_CLIENT_VERSION="$CI_COMMIT_ID"
   - name: "Deploy Production"
     service: deploy
     tag: production
-    command: "ansible-playbook -vv -i hosts/rackspace_prod platform-api-update.yml -e=\"PLATFORM_CLIENT_VERSION=$CI_COMMIT_ID\""
+    command: >
+      ansible-playbook -vv -i hosts/rackspace_prod platform-api-update.yml
+        -e PLATFORM_CLIENT_VERSION="$CI_COMMIT_ID"

docker/deploy.Dockerfile

@@ -2,7 +2,7 @@
 FROM williamyeh/ansible:ubuntu14.04
 
 # ==> Install git
-RUN apt-get update && apt-get install git -y
+RUN apt-get update && apt-get install git gettext -y
 
 # ==> Set workging directory to /opt
 WORKDIR /opt

docker/deploy.run.sh

@@ -14,14 +14,25 @@ if [ -n "${ANSIBLE_VAULT_PASSWORD}" ]; then
 fi
 
 # Append to ansible.cfg
-cat >> /opt/ansible.cfg << EOM
+envsubst >> /opt/ansible.cfg << EOM
 
 [ssh_connection]
-control_path=/dev/shm/ansible-ssh-%%h-%%p-%%r
+control_path=/dev/shm/ansible-ssh-${CI_BUILD_ID}-%%h-%%p-%%r
 EOM
 
 # ==> Get latest deployment code from github
 ansible-galaxy install -r roles.yml
 
-exec $*
+# Perform variable substitution on parameters
+#   i.e. if we get a parameter myvar="$CI_BRANCH" we substitute $CI_BRANCH for
+#        its actual value in the environment, and get i.e. myvar="master"
+args=()
+for p in $@; do
+    args+=(`printf '%s\n' $p | envsubst`)
+done
+
+# Execute parameter passed in arguments
+echo executing: "${args[@]}"
+
+exec "${args[@]}"