From 03af9da97d354a7b4dd305e872862baf67f4d7e6 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 26 Apr 2018 20:35:07 +0200
Subject: [PATCH] Travis build docker images.

---
 .travis.yml                                   | 13 ++++++++--
 .travis/docker.sh                             | 25 +++++++++++++++++++
 .travis/{update-wiki.sh => wiki.sh}           |  3 +++
 docker/{amd64 => }/Dockerfile                 |  0
 .../Dockerfile => Dockerfile.armv7hf}         |  0
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100755 .travis/docker.sh
 rename .travis/{update-wiki.sh => wiki.sh} (91%)
 rename docker/{amd64 => }/Dockerfile (100%)
 rename docker/{armv7hf/Dockerfile => Dockerfile.armv7hf} (100%)

diff --git a/.travis.yml b/.travis.yml
index ec7707773..991777923 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,10 @@
 language: node_js
+
+sudo: required
+
+services:
+  - docker
+
 node_js:
   - "9"
 
@@ -6,8 +12,11 @@ install:
   - npm install
 
 script:
-  - .travis/update-wiki.sh
+  - ".travis/docker.sh"
+  - ".travis/wiki.sh"
 
 env:
   global:
-    secure: q5W9+mHz13PslLkTxuYNXivOau+N5OyB53sqgb+krOCPlbN9+gvi2Av9SribVd5jp2yx2O9rV/mr8eS0M2ykvBJ3UsIsCXiFL1dEPmsz1wlFAnW3kbD2EGhGFEV0dWRflSlA+5iQtcMPvbYu2PAOChUUoY7NNlhcz2EC+XXUapvvvaDwA1oSdtX+m61qyREshZb8B57DyXhziy6i/xjhFa84C0mR/iGFRWpZgcxmrNFH+/XDhSIpdq2KshhDWhjyag3ukAsTxTpqzLh1rFRlczjJEn0CcHG4WHsWHUFn9KK2lvT/YCDP8w0URnR1bCr8nyxGZJ2DLW6AzxZtJfWjvbeZYjO2R3WeHpzp6Jw6Qz5pG3gmu2FgeFpZ3FTEGtJ/Ev0/pjkY2Msx9mItzUJ7D8hY2noQZMPASar6oXEDYlkomx7gHHla0MPv3PKSJg5LX6Ybl137GIa6MLYYyz6SEKfyRUQhy3Itqrb/ID/ZP0UuLgyyDfShb8A6XOnsVqwZAsOPtU2UPnD1vsVXhjkpflK9+7QjL5m9MSqfAhg6qtwNsswl1KSiyhmdldGhZW5OfUasDxZKHyx7bsS1BhNnLi/iy4ifDh6KSr64aUW4iM0X99gkU+662Hgf73QpIG+oP41r30iEN0unTcRrFQDIbTSSapbA95bwUCBF1CgQC20=
+  - secure: q5W9+mHz13PslLkTxuYNXivOau+N5OyB53sqgb+krOCPlbN9+gvi2Av9SribVd5jp2yx2O9rV/mr8eS0M2ykvBJ3UsIsCXiFL1dEPmsz1wlFAnW3kbD2EGhGFEV0dWRflSlA+5iQtcMPvbYu2PAOChUUoY7NNlhcz2EC+XXUapvvvaDwA1oSdtX+m61qyREshZb8B57DyXhziy6i/xjhFa84C0mR/iGFRWpZgcxmrNFH+/XDhSIpdq2KshhDWhjyag3ukAsTxTpqzLh1rFRlczjJEn0CcHG4WHsWHUFn9KK2lvT/YCDP8w0URnR1bCr8nyxGZJ2DLW6AzxZtJfWjvbeZYjO2R3WeHpzp6Jw6Qz5pG3gmu2FgeFpZ3FTEGtJ/Ev0/pjkY2Msx9mItzUJ7D8hY2noQZMPASar6oXEDYlkomx7gHHla0MPv3PKSJg5LX6Ybl137GIa6MLYYyz6SEKfyRUQhy3Itqrb/ID/ZP0UuLgyyDfShb8A6XOnsVqwZAsOPtU2UPnD1vsVXhjkpflK9+7QjL5m9MSqfAhg6qtwNsswl1KSiyhmdldGhZW5OfUasDxZKHyx7bsS1BhNnLi/iy4ifDh6KSr64aUW4iM0X99gkU+662Hgf73QpIG+oP41r30iEN0unTcRrFQDIbTSSapbA95bwUCBF1CgQC20=
+  - secure: iTw0uQezCWdOx6dGLUWtEeNHx6r9lsBTt71v7tL2rx8UbNIhs5YE6VawXX2ITFtcMc/BMCIr3XcqZqJCNVab6jc4bH1SftiCZYZWmqTxFmvMUlZvzhT3JCi85OLWEaFFTLSJ10775Nv5Poh13wNhoVRz+t6Gce3AHhGj68/P1/Hi/j+IW99M2/l+qiw9KnDn4GExSCF9OivK4hkNEce9LpGjHbaVC1U00iq2/nVsWFQR9t9FWiZqSaYKltwfFS+yn86v+XohP+b2AyYKA0sdfy4oJkTk5U+tEkecKQQHC31Ox0VldK87sCtBHjTUCyHhxMdmVmhnXTrbH3C9whOqUnV6vfE0gGnPDSSn7D6+vSKM1jz1atYvNy2kVHE7CcJVT1jn9GIsLoRSpIDwm8PwOKldXXhaRoDZJ2RIlxjbPqFmKinQOYzJPU7OztB4s/rm5gBWRzRCMNg92MXso6xls7yvUAhTkZp0YETi0NqU26IAZUP4qxS7oQbNwKDgp7QfBwWWCMuoKMlm4yXHlWxJ9GI2nfzZiDzntujz2u3Woji7/050sa53ulKrINjV4GqkiSc/XHGP4xLYMjFWPJWf+w/Fh/J3S3HVO5BC5/H1eOYL5tTeH+WcRJNIteACjLGMuviVDFF9pdVTgBSqgEOMNWtxZxSjGztCOg0LTPtIWz0=
+  - secure: em3lBVXvZ3kOVI4ipVlh93NIU6guLvyzHMmsLDuxhc92VFURqlYu3iXTTNEnknwyE31mziAkVFnmj+3OENd/VfzP01d4KKaYAQrbn2AnOMvcIIExLfaFU5QqbW1RMwRBIifhvrmboKt07pFsUy3Rghs80SwNSFDfLFoMhFMz+NdIZfJGW8LJy+gUPmz10YGzqh/chreowqOemgBBoswCGwIh1xB1KNejew3bQllnwQYGXcGuTDwDT4Wz+ObxlFt7YR/4n4oJY8jQYRPolM9qHQAGyn/Cn0TL3c8JqiBpVc1hm2OhYSDqvK0xf5IKsD+kIfFJPGa7nF2cwmhKdUNYR47oue3KB5tdrtDhwqUooTglvBOSXUIbthUR9Xu40ziyd5tHy0ixaLnDRGuKIIvEnXlcE6CgApoe3y2kHYa5dY+eUKxWwvH7b5hG+u82dYvw3VYpCHAnDQVgUzz4F63qZ2WZhcH0W3PF3/ytVAHyMu2vAMSrSXGi5xgM6el7Gp7SFVTFXBurbOaoJ3ZwwSEDP5d8mDyk1d8thmkQFL9P6iWtNnXOzjv4GIliEDWQg76BX6MLD3n3fnP0aq+RVmv+ev2Lp4xZZDfgGPek7g35IsaiohH6YvHloxE+ETQ0Ttb1lCQos9fj7LlI+ud6ExjwyRuEnzCOzr/qC/3Leg85Wc8=
diff --git a/.travis/docker.sh b/.travis/docker.sh
new file mode 100755
index 000000000..07b9ec30b
--- /dev/null
+++ b/.travis/docker.sh
@@ -0,0 +1,25 @@
+#!/bin/sh -e
+
+login() {
+  echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
+}
+
+build_and_push() {
+  docker build -t koenkk/zigbee2mqtt:$1 -f $2 .
+  docker push koenkk/zigbee2mqtt:$1
+}
+
+push() {
+  docker build -t koenkk/zigbee2mqtt:$1
+}
+
+# Only update docker images if on master branch and not pull request
+if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]
+then
+  echo "Updating docker images!"
+  login
+  build_and_push latest docker/Dockerfile
+  build_and_push armv7hf docker/Dockerfile.armv7hf
+else
+  echo "Not updating docker images, triggered by pull request or not on master branch"
+fi
diff --git a/.travis/update-wiki.sh b/.travis/wiki.sh
similarity index 91%
rename from .travis/update-wiki.sh
rename to .travis/wiki.sh
index 78bac1305..cfd7d3925 100755
--- a/.travis/update-wiki.sh
+++ b/.travis/wiki.sh
@@ -13,11 +13,14 @@ update_wiki() {
   git add -A
   git commit -m "Travis CI: update wiki"
   git push origin
+  cd ..
+  rm -rf zigbee2mqtt.wiki
 }
 
 # Only update wiki if on master branch and not pull request
 if [ "$TRAVIS_BRANCH" = "master" -a "$TRAVIS_PULL_REQUEST" = "false" ]
 then
+  echo "Updating wiki!"
   setup_git
   update_wiki
 else
diff --git a/docker/amd64/Dockerfile b/docker/Dockerfile
similarity index 100%
rename from docker/amd64/Dockerfile
rename to docker/Dockerfile
diff --git a/docker/armv7hf/Dockerfile b/docker/Dockerfile.armv7hf
similarity index 100%
rename from docker/armv7hf/Dockerfile
rename to docker/Dockerfile.armv7hf