deploy.sh now runs ansible cmd. Travis will only run deploy when on branch dev. Docker recreate commands are now in recreate_container.sh.

Author: matthias_schaub

.travis.yml

@@ -48,4 +48,10 @@ after_success:
   - openssl aes-256-cbc -K $encrypted_c17fa81e6490_key -iv $encrypted_c17fa81e6490_iv -in travis/ssh-private-key.enc -out travis/ssh-private-key -d
   - chmod 600 travis/ssh-private-key
   - ssh-add travis/ssh-private-key
-  - ansible-playbook -i ansible/inventory.yml ansible/playbook.yml  # Deploy to dev server
+  - chmod +x deploy.sh
+
+deploy:
+  provider: script
+  script: bash deploy.sh
+  on:
+    branch: dev

ansible/playbook.yml

@@ -9,4 +9,4 @@
         dest: /home/mapswipe/python-mapswipe-workers
         version: dev
     - name: Rebuild and restart Docker container usind Docker-Compose.
-      script: /home/mapswipe/python-mapswipe-worker/deploy.sh
+      script: /home/mapswipe/python-mapswipe-worker/recreate_container.sh

deploy.sh

@@ -1,21 +1,4 @@
 #!/bin/bash
-# This script builds and starts all Docker container for running the Mapswipe ecosystem.
-# It is run either manually or by an Ansible Playbook after a successful Travis build.
-
-# docker-compose build --no-cache postgres firebase_deploy mapswipe_workers manager_dashboard nginx api
-docker-compose build --no-cache postgres mapswipe_workers manager_dashboard nginx api
-if [[ $? = 0 ]]; then
-    echo "success"
-else
-    echo "failure: $?"
-    exit
-fi
-
-# docker-compose up -d --force-recreate postgres firebase_deploy mapswipe_workers manager_dashboard nginx api
-docker-compose up -d --force-recreate postgres mapswipe_workers manager_dashboard nginx api
-if [[ $? = 0 ]]; then
-    echo "success"
-else
-    echo "failure: $?"
-    exit
-fi
+# Deploy to dev server.
+# This script is called by Travis.
+ansible-playbook -i ansible/inventory.yml ansible/playbook.yml

recreate_container.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+# This script builds and starts all Docker container for running the Mapswipe ecosystem.
+# It is run either manually or by an Ansible Playbook after a successful Travis build.
+
+# docker-compose build --no-cache postgres firebase_deploy mapswipe_workers manager_dashboard nginx api
+docker-compose build --no-cache postgres mapswipe_workers manager_dashboard nginx api
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi
+
+# docker-compose up -d --force-recreate postgres firebase_deploy mapswipe_workers manager_dashboard nginx api
+docker-compose up -d --force-recreate postgres mapswipe_workers manager_dashboard nginx api
+if [[ $? = 0 ]]; then
+    echo "success"
+else
+    echo "failure: $?"
+    exit
+fi