From 0b2fcca2408718f3e6dc4b8f23c287ef3d5308a8 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Sun, 18 Oct 2015 19:30:09 +0200 Subject: [PATCH 01/20] :new: docker-compose travis integration --- .travis.yml | 28 ++++++++++++++++------------ install_prerequisites.sh | 7 +++++++ install_prerequisites_mac.sh | 7 +++++++ 3 files changed, 30 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0d5392a..e21dc0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,28 @@ udo: required services: - - docker +- docker branches: except: - /-job-\d+/ only: - master before_install: - - set -e - - curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname -s`-`uname -m`" > docker-compose - - chmod +x docker-compose - - sudo mv docker-compose /usr/local/bin -install: +- set -e +- curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname + -s`-`uname -m`" > docker-compose +- chmod +x docker-compose +- sudo mv docker-compose /usr/local/bin +install: script: - - docker-compose build -# - docker-compose up +- docker-compose build after_script: - - docker-compose version - - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" -after_success: +- docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" +- docker-compose version +- echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" +- echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" +after_success: env: global: + - secure: sVIdNG7wejYznrbLJ8UYRKX+11gxzvd9dcH/57FH2grCMt7Fww5Y8NZUeDCxKwAUyJAm8p+nqclCZhXQD8argox3LqGsSbS+J/7glhVT7QtaHJ9OkOnr/VlZ5KOhS0/zCr34/OaUzcak2fbfjoHAIQRMGSsbF8VX1jQ+WdMnxp8nTNieuzX+MvDe2qezBFsI+XCx7f0npmkXTFhxn42P8nLezKbpubdt5BuplDlc5bQXG/vksXU1g889ZpvRKWuGf5ShXjBfAY/ABf+8G62oUmBxrYzxHVvP4nC0y7W9vCM06jIrf8/jxNGdvDjvvhQcbD+RP0aYZjsFrl5ZZD4VpbkroW0JQlQ6WYwH8kHUPLe8PFKcZAkuwxI/6PZL3kPa42TPV0Nom+OH8a4gXm6f1s01ODUOFsBT+16Lsm5IMOmrI4aAN4F9jY7pchmR+KR6yCOFPrB03dR9Snuc0/8sd/7NDP2I9igu7s71v4s2Fa+2pyKtm8epvfyNDsDlDvsf6q6OCikM0MfLqkU3Qs2oBu5Z0SyJxEajlYMa3nAGbq36QzoxYqVW4IByPt3edFMRVphLFwPJVT36yTKeouXdMPeOuNeLGUrq/y49P3DwsnbODsG3aj3oHXPp5PPTOmYH74zHMtKO5z6FunQp4+utPvHsO7dfFUUjKbIolYnXB40= + - secure: U30G6IlT2hq5Q2b3nZ6grh4pkW81rV2ogS1iLPpoSxzXGt897S/R9tRsL9gCQ5srDbVPNR7Wu2wLq5W77NgpCjRDzXQQEcrdsKoNu61I3C05QOm/dFK/RN/6b+qhVBefluFuKw1wZw1I7XULctCU5q3V+8jVO1VWrxd1IEh0M7yqisw/k2thxAUu2l/WeEs4088EA3mDZ1PZka8+LQKVZ6FW/2rGUA88prfitb4a3YwVdnvGFc4MYbj/vhmZjymIj6UMivaOZ9O/eTDzYqy4zDnD0RYPhmWUHAcTtys9tCttqesPo3jgVFQ2TTZ0jx22BCcltxE9GFF9VUl0+y1AVqbBfI3e70YbuAdCg8Vu5BRzFxJCZdFF4sQsPskNiXwg3fiSl1pqpk/JK9pja6tCACCqyeJTsZQFYF/fLEXGmQkY9A5Y5ZDd6RgPKqc2N2WfQ8v+RcgB2SOITIbk+qb2R3V8ITk9MNDsKpG90PlYJt3zM9XyRX+EVqigkGO5MJOR2afExJzFjDvZzTLcRyWkTy7ZRAChXgCGrPYSj6d7uH45BF+VxsmcRIcwDC1mVT2hVnNK+06B2PrpmwzoAcnC+RiKQabX7qz8oPN61IfXL+eeumfdDbZT6hAInF7Fn2ZFsIPYuAR6TNJUA6oyrDnKX7o64/6ARqahqfsoFakuawA= + - secure: B/R29yo5dY6xToWveukqq6UKL7Zqbur0s1ypU3JS2qFISwsFm8BGxp1D6p9WjPYTzryNyqPftoQXgNJvL9rrpkBmxFtCBg4Z1jjecXqRyPKMbV/Hlg3bZsBcsPRZS5MYZT81QDBODB4sXTJTY+R9wutiLMAlMoREeh9+eAI+lBiCaG9SZecbtRob4ot1+g201dPF1/hLEMv0lBKJf7ZT5qk1o5awlOB/4eiNwR6bbsTYSJqr5UR0nKqWhWsj9rhNdiwch2pFayh6HGDdecU0SpScAx0yM7fcBxon9OHEx8C9v/dt24W95PGWIXjWdI3tZd0LOXRTrRZStTqjNPbB5K/Z8dcDuVUWPbyiHu/OmJ1H2SgT9xb3QcFiQGZZENWPVltq5zj0/Z32W2Z9hob5+f7kuEs+ajXUnZm+LkkEYbxQScGTF0A2dvRaOl1Cw88PlWdnA/rtakVs4mL54yUeUSbkF4/l+eplCdEy+29tIi5fJ1UbKt80rxZAY3ONxaeiXsXls7RcXBi33tq2Olemyg7o/nrboHJox63tIOS6nGnLF03aEJRKRHPEi2Rd/1tSel4s6JHabVDurz6wObeNvPAq1IEP1XMRlcvHotKItxJwTXuvn212PmKt54Za5RopczL/tZ8ONDnQk3ybfO4+Lc2ZteLVIDL0BEuTkA0U2b4= diff --git a/install_prerequisites.sh b/install_prerequisites.sh index ac8b45b..8b3662d 100644 --- a/install_prerequisites.sh +++ b/install_prerequisites.sh @@ -8,6 +8,13 @@ wget -qO- https://get.docker.com/ | sh #For not having to do 'sudo docker' but this represents a security issue so i am leaving it unset by default #sudo usermod -aG docker +#Install travis-cli command line to be able to encrypt api_keys in the Travis build +sudo gem install travis +#Encrypt your code climate key for Travis build and add it automatically to your .travis.yml +#remember explicitly declare this variables in +#https://travis-ci.org///settings/env_vars +travis encrypt DOCKER_USER= --add && travis encrypt DOCKER_PASSWORD= --add && travis encrypt DOCKER_EMAIL= --add + #Docker-Compose sudo curl -L https://github.com/docker/compose/releases/download/1.3.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose chmod +x /usr/local/bin/docker-compose diff --git a/install_prerequisites_mac.sh b/install_prerequisites_mac.sh index 17580d9..407f517 100644 --- a/install_prerequisites_mac.sh +++ b/install_prerequisites_mac.sh @@ -2,6 +2,13 @@ #Pre-requisites brew install curl docker docker-compose +#Install travis-cli command line to be able to encrypt api_keys in the Travis build +sudo gem install travis +#Encrypt your code climate key for Travis build and add it automatically to your .travis.yml +#remember explicitly declare this variables in +#https://travis-ci.org///settings/env_vars +travis encrypt FIREBASE_TOKEN= --add + #Check installed versions docker --version docker-compose --version From 6c45dfceb9400031c0bd84b2b442f04bf639ddb4 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Sun, 18 Oct 2015 19:31:00 +0200 Subject: [PATCH 02/20] :new: docker-compose travis integration --- .travis.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e21dc0a..5c43eec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,7 @@ branches: - master before_install: - set -e -- curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname - -s`-`uname -m`" > docker-compose + - curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname -s`-`uname -m`" > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin install: From e582df5c6d583adf1e7a830fecf994819c1e3053 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Sun, 18 Oct 2015 19:39:12 +0200 Subject: [PATCH 03/20] :new: docker-compose travis integration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5c43eec..c5eee91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ install: script: - docker-compose build after_script: -- docker login -e="$DOCKER_EMAIL" -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" +- docker login -e="${DOCKER_EMAIL}" -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}" - docker-compose version - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" From 364c1516a79bd950a1c7d500cd5791fefdcf6963 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Sun, 18 Oct 2015 19:42:34 +0200 Subject: [PATCH 04/20] :new: docker-compose travis integration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c5eee91..d9703ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ install: script: - docker-compose build after_script: -- docker login -e="${DOCKER_EMAIL}" -u="${DOCKER_USERNAME}" -p="${DOCKER_PASSWORD}" +- docker login -e "${DOCKER_EMAIL}" -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" - docker-compose version - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" From 71bfbd193196b2da281d3cc0784288b5cc928acc Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Sun, 18 Oct 2015 19:48:01 +0200 Subject: [PATCH 05/20] :new: docker-compose travis integration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d9703ec..2051f79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ install: script: - docker-compose build after_script: -- docker login -e "${DOCKER_EMAIL}" -u "${DOCKER_USERNAME}" -p "${DOCKER_PASSWORD}" +- docker login -e=${DOCKER_EMAIL} -u=${DOCKER_USERNAME} -p=${DOCKER_PASSWORD} sloppylopez/docker_elk_stack - docker-compose version - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" From 5ac78ad16b63f5397c6e986d518da1b311f4e8e6 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Sun, 18 Oct 2015 19:50:55 +0200 Subject: [PATCH 06/20] :new: docker-compose travis integration --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2051f79..a355e40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -udo: required +sudo: required services: - docker branches: @@ -8,7 +8,7 @@ branches: - master before_install: - set -e - - curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname -s`-`uname -m`" > docker-compose +- curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname -s`-`uname -m`" > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin install: From c927f72d709126949e5fac255f5aab90489a584e Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Sun, 18 Oct 2015 20:08:14 +0200 Subject: [PATCH 07/20] :new: docker-compose travis integration --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a355e40..d2a306d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,8 @@ install: script: - docker-compose build after_script: -- docker login -e=${DOCKER_EMAIL} -u=${DOCKER_USERNAME} -p=${DOCKER_PASSWORD} sloppylopez/docker_elk_stack +#- sh ./stop_all_containers.sh +- docker login --email=${DOCKER_EMAIL} --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} - docker-compose version - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" From e9508671d33860c9380c31047e0512a9d98fd64e Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Sun, 18 Oct 2015 20:18:13 +0200 Subject: [PATCH 08/20] :new: docker-compose travis integration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d2a306d..abc31a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ script: - docker-compose build after_script: #- sh ./stop_all_containers.sh -- docker login --email=${DOCKER_EMAIL} --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} +- docker login --email=${DOCKER_EMAIL} --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} https://hub.docker.com/r/sloppylopez/docker_elk_stack/ - docker-compose version - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" From f43f8b446c437bfa60c7eb2fc2c46807017f9eda Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Sun, 18 Oct 2015 21:37:32 +0200 Subject: [PATCH 09/20] :new: docker-compose travis integration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index abc31a5..c18fe9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ script: - docker-compose build after_script: #- sh ./stop_all_containers.sh -- docker login --email=${DOCKER_EMAIL} --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} https://hub.docker.com/r/sloppylopez/docker_elk_stack/ +#- docker login --email=${DOCKER_EMAIL} --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} https://hub.docker.com/r/sloppylopez/docker_elk_stack/ - docker-compose version - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" From dcf855c9d6cb3e101a149704b918c06eb80a61fa Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Mon, 19 Oct 2015 12:35:54 +0200 Subject: [PATCH 10/20] :new: docker-compose travis integration --- .travis.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c18fe9a..3f5f0db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,10 @@ script: - docker-compose build after_script: #- sh ./stop_all_containers.sh -#- docker login --email=${DOCKER_EMAIL} --username=${DOCKER_USERNAME} --password=${DOCKER_PASSWORD} https://hub.docker.com/r/sloppylopez/docker_elk_stack/ +- echo ${DOCKER_EMAIL} +- echo ${DOCKER_USERNAME} +- echo ${DOCKER_PASSWORD} +- docker login --e ${DOCKER_EMAIL} --u ${DOCKER_USERNAME} --p ${DOCKER_PASSWORD} - docker-compose version - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" From 59f55176ac2c833e3ce090dbf61456628a091908 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Mon, 19 Oct 2015 12:52:08 +0200 Subject: [PATCH 11/20] :new: docker-compose travis integration --- .travis.yml | 16 ++++++++-------- install_prerequisites.sh | 2 +- install_prerequisites_mac.sh | 5 +++-- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3f5f0db..3298006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,17 +8,17 @@ branches: - master before_install: - set -e -- curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname -s`-`uname -m`" > docker-compose +- curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname + -s`-`uname -m`" > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin install: script: - docker-compose build after_script: -#- sh ./stop_all_containers.sh -- echo ${DOCKER_EMAIL} -- echo ${DOCKER_USERNAME} -- echo ${DOCKER_PASSWORD} +#- echo ${DOCKER_EMAIL} +#- echo ${DOCKER_USERNAME} +#- echo ${DOCKER_PASSWORD} - docker login --e ${DOCKER_EMAIL} --u ${DOCKER_USERNAME} --p ${DOCKER_PASSWORD} - docker-compose version - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" @@ -26,6 +26,6 @@ after_script: after_success: env: global: - - secure: sVIdNG7wejYznrbLJ8UYRKX+11gxzvd9dcH/57FH2grCMt7Fww5Y8NZUeDCxKwAUyJAm8p+nqclCZhXQD8argox3LqGsSbS+J/7glhVT7QtaHJ9OkOnr/VlZ5KOhS0/zCr34/OaUzcak2fbfjoHAIQRMGSsbF8VX1jQ+WdMnxp8nTNieuzX+MvDe2qezBFsI+XCx7f0npmkXTFhxn42P8nLezKbpubdt5BuplDlc5bQXG/vksXU1g889ZpvRKWuGf5ShXjBfAY/ABf+8G62oUmBxrYzxHVvP4nC0y7W9vCM06jIrf8/jxNGdvDjvvhQcbD+RP0aYZjsFrl5ZZD4VpbkroW0JQlQ6WYwH8kHUPLe8PFKcZAkuwxI/6PZL3kPa42TPV0Nom+OH8a4gXm6f1s01ODUOFsBT+16Lsm5IMOmrI4aAN4F9jY7pchmR+KR6yCOFPrB03dR9Snuc0/8sd/7NDP2I9igu7s71v4s2Fa+2pyKtm8epvfyNDsDlDvsf6q6OCikM0MfLqkU3Qs2oBu5Z0SyJxEajlYMa3nAGbq36QzoxYqVW4IByPt3edFMRVphLFwPJVT36yTKeouXdMPeOuNeLGUrq/y49P3DwsnbODsG3aj3oHXPp5PPTOmYH74zHMtKO5z6FunQp4+utPvHsO7dfFUUjKbIolYnXB40= - - secure: U30G6IlT2hq5Q2b3nZ6grh4pkW81rV2ogS1iLPpoSxzXGt897S/R9tRsL9gCQ5srDbVPNR7Wu2wLq5W77NgpCjRDzXQQEcrdsKoNu61I3C05QOm/dFK/RN/6b+qhVBefluFuKw1wZw1I7XULctCU5q3V+8jVO1VWrxd1IEh0M7yqisw/k2thxAUu2l/WeEs4088EA3mDZ1PZka8+LQKVZ6FW/2rGUA88prfitb4a3YwVdnvGFc4MYbj/vhmZjymIj6UMivaOZ9O/eTDzYqy4zDnD0RYPhmWUHAcTtys9tCttqesPo3jgVFQ2TTZ0jx22BCcltxE9GFF9VUl0+y1AVqbBfI3e70YbuAdCg8Vu5BRzFxJCZdFF4sQsPskNiXwg3fiSl1pqpk/JK9pja6tCACCqyeJTsZQFYF/fLEXGmQkY9A5Y5ZDd6RgPKqc2N2WfQ8v+RcgB2SOITIbk+qb2R3V8ITk9MNDsKpG90PlYJt3zM9XyRX+EVqigkGO5MJOR2afExJzFjDvZzTLcRyWkTy7ZRAChXgCGrPYSj6d7uH45BF+VxsmcRIcwDC1mVT2hVnNK+06B2PrpmwzoAcnC+RiKQabX7qz8oPN61IfXL+eeumfdDbZT6hAInF7Fn2ZFsIPYuAR6TNJUA6oyrDnKX7o64/6ARqahqfsoFakuawA= - - secure: B/R29yo5dY6xToWveukqq6UKL7Zqbur0s1ypU3JS2qFISwsFm8BGxp1D6p9WjPYTzryNyqPftoQXgNJvL9rrpkBmxFtCBg4Z1jjecXqRyPKMbV/Hlg3bZsBcsPRZS5MYZT81QDBODB4sXTJTY+R9wutiLMAlMoREeh9+eAI+lBiCaG9SZecbtRob4ot1+g201dPF1/hLEMv0lBKJf7ZT5qk1o5awlOB/4eiNwR6bbsTYSJqr5UR0nKqWhWsj9rhNdiwch2pFayh6HGDdecU0SpScAx0yM7fcBxon9OHEx8C9v/dt24W95PGWIXjWdI3tZd0LOXRTrRZStTqjNPbB5K/Z8dcDuVUWPbyiHu/OmJ1H2SgT9xb3QcFiQGZZENWPVltq5zj0/Z32W2Z9hob5+f7kuEs+ajXUnZm+LkkEYbxQScGTF0A2dvRaOl1Cw88PlWdnA/rtakVs4mL54yUeUSbkF4/l+eplCdEy+29tIi5fJ1UbKt80rxZAY3ONxaeiXsXls7RcXBi33tq2Olemyg7o/nrboHJox63tIOS6nGnLF03aEJRKRHPEi2Rd/1tSel4s6JHabVDurz6wObeNvPAq1IEP1XMRlcvHotKItxJwTXuvn212PmKt54Za5RopczL/tZ8ONDnQk3ybfO4+Lc2ZteLVIDL0BEuTkA0U2b4= + - secure: wEb65XTiYncCI7JB8RJqdI1OufgDvVuY+FMa2KN1yeFy+XQ46Nux0Dh08wGzvWMyKRwM1ouwFdnzpYGIJlmUFRiANWKLiF0lPZLnLtaKBoDVLNy2XC/frvA4e8kYSYzM3TNzkujsbcxSgrFx0sLmB4l8IRgJi6Zk7CxjUXvfVDrUd50CIvwmkehEbOSUb4MymB1PamOEzT+u7U4FzpCdrLHUl5dY0Yw1K8i15nvklXvyQkH6SUIiU2K8C0K1IWwxeejafjxjDp7r6/U70smi4gowiNuYIcNftRjezUwyTBZtL1Tug5jrGUgjTBwtlDVBDuZv+1mz6BuspldKUlfYb29gIhfS5TJShTIoy5PwzeAen2Bky2tXOMtzcAq6ZxmGOqOkUzq4rObEsO3k9/pdh8dtHkqt04BqCWQNFgsjMz07okVU521GkTgDlWKhKfmxVRKz7UBMZm/B14jU4ooxublclOVEEYNpue9wd4hYRk1+XSgZtn4a9oY5NxtqC+6BoNA6fKvudhhQnmVA6EjTdDc8zncUjGz2acozE7lpzfwMtd8mkAZaVzy92R5OneGY7L5axdsbgeWGAYBZ4ks1yZJhZZ8B4x8cBq/hpeOifpaooUa2np5HXZfuCO3NKlsJedlp78rCp47Y+4FF5mq241lWiCyGvdoAz4IYDqER3pM= + - secure: S1Xg2X3s6WaA0Aa4Rdi0/jfdHBWIVcAo2VGFdN83KdXgSWumHHfYogkP+oze1TwyqFXFhHxpUWBb7WgYUWTflD0FD4Vd6mvwRVwzP5vPsvLmOeNIg8J7XLf4X39bcg8yaf9BOiuKLh7BW1kq3DsrdHQH8j17MiBX1dXqYYVBugYgU0SKgK2TlrQNh4ziHOJyVZl/tl7MHEHvZo6I/J7/LwZMmOQWCtG5fzI+jQ9r4SpXYxdJs+N1G8QiNq+89qWhX2gi9WCoOCkjoy3WBEgrZsnrt9uDgyCfC4F3QC7F5E9D1a6iWQhRPbpA8JOhTPa1ZuHDzXFermvNgm+5DYN4yK47ZZe4vi15d4Y7s62RXV0pFkxHdsMfHpijKuC4IE8ounwfCTVremIBBc53GEwD/Scm8JnJk+G1HnZDdcc4IKuu40HJZ0QUVX8N/Q8JvIBgYycXMtrw7fjXeW9vEJ1rNIhNINouHRyEDvd0DjRokqLE0EdSejSROpabDdrwUlnDlWHYxMY14pWDhsu5Z5uLi98unr1UeOqanNx9TF1FhSWKTGPrx5KWkaPFbcwEbv0drKMMrz1s8BxkUh/8nUL/hIOIL8Od0P4ciXfKJRG+eD2UjpLbtJ66GQ3dvYQRyKTxgVnJhXAesuSaNuNzg5mochd+DXEUlILJ4XNDrtlChiQ= + - secure: OAP+Fq3i4qg3J814NXEyUvlHVY9gVUGEiJGQ1mG5aUQ38zCiK3HX8ps7IAvm1I3ciErLo/i3RLBBOpcdsXo076RsfjA1KaFwyQJnIlyVY+rUcc9nUIVbGeoQ/kIpIRWWrY7fBUoJklIxnGrf1MRzZSxFv07HbrqhbNWMapR++ScYZ7QQwVsdbXQS9RFkTwfHdJWyOgNyPmpqYAwOUgFj/+pAViYzzWxgqnNY5LS+q+87Qh0Fb6V1OdT+SrswbMm26tTclVOKQZP2TEJY+LRCMVKs/OavtAdDZQLe35/fQVCRS28as7YV74QZiaQ60JrO5qUr2Tb5Fkshr8p9OGwst3ZS3qJzQHLEYspD1AfYO2kgYkk41cHqTvqlN2nfW0Py+9CWfhUhK6/tktPON55dmltpZKWDY7Z6ao+/XxIEgpclQbUGs7HR7MtBZ+2/1CowJvNpd9AuoOlucdLb76ekt6RhEtEzfL51ohcqWuS9zDTypQ0lgClGp5Q4BTB/VzEFcm6q7HmXPxZdGHN6smj2chUIGKtxy8V6EefdzFo3L2pJi7XIyzsx1mK4pVjnL0Wen7a2sR4nAPbtLqlCI3x1SmQDIu1b21hdSt6QXGogV3gcCfzIp53vJCYL+t1KjsyQmggja8EtZODPX/W41qjCj8xabUNUxUn5FdWkItvU560= diff --git a/install_prerequisites.sh b/install_prerequisites.sh index 8b3662d..8305299 100644 --- a/install_prerequisites.sh +++ b/install_prerequisites.sh @@ -13,7 +13,7 @@ sudo gem install travis #Encrypt your code climate key for Travis build and add it automatically to your .travis.yml #remember explicitly declare this variables in #https://travis-ci.org///settings/env_vars -travis encrypt DOCKER_USER= --add && travis encrypt DOCKER_PASSWORD= --add && travis encrypt DOCKER_EMAIL= --add +travis encrypt DOCKER_EMAIL= && travis encrypt DOCKER_USER= --add && --add && travis encrypt DOCKER_PASSWORD= --add #Docker-Compose sudo curl -L https://github.com/docker/compose/releases/download/1.3.0/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose diff --git a/install_prerequisites_mac.sh b/install_prerequisites_mac.sh index 407f517..682fc90 100644 --- a/install_prerequisites_mac.sh +++ b/install_prerequisites_mac.sh @@ -7,8 +7,9 @@ sudo gem install travis #Encrypt your code climate key for Travis build and add it automatically to your .travis.yml #remember explicitly declare this variables in #https://travis-ci.org///settings/env_vars -travis encrypt FIREBASE_TOKEN= --add - +travis encrypt DOCKER_EMAIL= --add +travis encrypt DOCKER_USER= --add +travis encrypt DOCKER_PASSWORD= --add #Check installed versions docker --version docker-compose --version From 6ae12ea7b0559e5186f68707a1a406890d5a6777 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Mon, 19 Oct 2015 12:54:32 +0200 Subject: [PATCH 12/20] :new: docker-compose travis integration --- .travis.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3298006..d86334f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,13 +8,12 @@ branches: - master before_install: - set -e -- curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname - -s`-`uname -m`" > docker-compose +- curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname -s`-`uname -m`" > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin install: script: -- docker-compose build +- docker-compose version after_script: #- echo ${DOCKER_EMAIL} #- echo ${DOCKER_USERNAME} From ced90dc40a6398acf1bdd4e2e266a2f7d95a2617 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Mon, 19 Oct 2015 12:56:40 +0200 Subject: [PATCH 13/20] :new: docker-compose travis integration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d86334f..17aa8a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ after_script: #- echo ${DOCKER_EMAIL} #- echo ${DOCKER_USERNAME} #- echo ${DOCKER_PASSWORD} -- docker login --e ${DOCKER_EMAIL} --u ${DOCKER_USERNAME} --p ${DOCKER_PASSWORD} +- docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD} - docker-compose version - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" From d4e3a5ab9a53f17d454d3c53cbdcf950dde828d4 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Mon, 19 Oct 2015 12:59:06 +0200 Subject: [PATCH 14/20] :new: docker-compose travis integration --- .travis.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17aa8a7..46b8aaa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,15 +11,16 @@ before_install: - curl -L "https://github.com/docker/compose/releases/download/1.4.2/docker-compose-`uname -s`-`uname -m`" > docker-compose - chmod +x docker-compose - sudo mv docker-compose /usr/local/bin -install: +install: +- docker version +- docker-compose version script: - docker-compose version after_script: -#- echo ${DOCKER_EMAIL} -#- echo ${DOCKER_USERNAME} -#- echo ${DOCKER_PASSWORD} +- echo ${DOCKER_EMAIL} +- echo ${DOCKER_USERNAME} +- echo ${DOCKER_PASSWORD} - docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD} -- docker-compose version - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" after_success: From 15402ac2fad17b7359f63d8c549508a9b4a40c65 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Mon, 19 Oct 2015 13:06:06 +0200 Subject: [PATCH 15/20] :new: docker-compose travis integration --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 46b8aaa..ded127f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,12 +18,12 @@ script: - docker-compose version after_script: - echo ${DOCKER_EMAIL} -- echo ${DOCKER_USERNAME} +- echo ${DOCKER_USER} - echo ${DOCKER_PASSWORD} -- docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD} +- docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" -after_success: +after_success: env: global: - secure: wEb65XTiYncCI7JB8RJqdI1OufgDvVuY+FMa2KN1yeFy+XQ46Nux0Dh08wGzvWMyKRwM1ouwFdnzpYGIJlmUFRiANWKLiF0lPZLnLtaKBoDVLNy2XC/frvA4e8kYSYzM3TNzkujsbcxSgrFx0sLmB4l8IRgJi6Zk7CxjUXvfVDrUd50CIvwmkehEbOSUb4MymB1PamOEzT+u7U4FzpCdrLHUl5dY0Yw1K8i15nvklXvyQkH6SUIiU2K8C0K1IWwxeejafjxjDp7r6/U70smi4gowiNuYIcNftRjezUwyTBZtL1Tug5jrGUgjTBwtlDVBDuZv+1mz6BuspldKUlfYb29gIhfS5TJShTIoy5PwzeAen2Bky2tXOMtzcAq6ZxmGOqOkUzq4rObEsO3k9/pdh8dtHkqt04BqCWQNFgsjMz07okVU521GkTgDlWKhKfmxVRKz7UBMZm/B14jU4ooxublclOVEEYNpue9wd4hYRk1+XSgZtn4a9oY5NxtqC+6BoNA6fKvudhhQnmVA6EjTdDc8zncUjGz2acozE7lpzfwMtd8mkAZaVzy92R5OneGY7L5axdsbgeWGAYBZ4ks1yZJhZZ8B4x8cBq/hpeOifpaooUa2np5HXZfuCO3NKlsJedlp78rCp47Y+4FF5mq241lWiCyGvdoAz4IYDqER3pM= From 0d7c48be5120c73de1b3356cf92fd31f4c332b98 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Mon, 19 Oct 2015 13:12:57 +0200 Subject: [PATCH 16/20] :new: docker-compose travis integration --- .travis.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index ded127f..6e1f9b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,11 @@ install: - docker version - docker-compose version script: -- docker-compose version +- docker-compose up after_script: -- echo ${DOCKER_EMAIL} -- echo ${DOCKER_USER} -- echo ${DOCKER_PASSWORD} - docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} +- docker images +- docker push sloppylopez/docker_elk_stack - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" after_success: From 568e9127a7449d37ed12d169e5a416200df37460 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Mon, 19 Oct 2015 23:27:42 +0200 Subject: [PATCH 17/20] :new: fix ci-cd --- elasticsearch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index b7e07c9..e452bc3 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update # Auto-accept the Oracle JDK license RUN echo oracle-java8-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections -RUN apt-get install -y oracle-java8-installer +RUN apt-get install -y --force-yes oracle-java8-installer # Set install version ENV ES_PKG_NAME elasticsearch-1.5.1 From 3e9ef76ed9dbeb3142f0b3d0ea390fc101566d01 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Mon, 19 Oct 2015 23:55:46 +0200 Subject: [PATCH 18/20] :new: first commit --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6e1f9b0..86d94e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ install: - docker version - docker-compose version script: -- docker-compose up +- docker-compose build after_script: - docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} - docker images From fcd8d8b3be3547cd5f0a525e2495de85f71841b9 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Tue, 20 Oct 2015 00:08:36 +0200 Subject: [PATCH 19/20] :new: docker-compose travis integration --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 86d94e3..fac8204 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ install: script: - docker-compose build after_script: -- docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} +- docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} sloppylopez/docker_elk_stack - docker images - docker push sloppylopez/docker_elk_stack - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" From 5c1798c6c2d63b99702bd37dcf9fba5721fe7e99 Mon Sep 17 00:00:00 2001 From: sloppylopez <18N3m3s1s> Date: Tue, 20 Oct 2015 00:17:47 +0200 Subject: [PATCH 20/20] :new: docker-compose travis integration --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index fac8204..ada7365 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,11 +17,11 @@ install: script: - docker-compose build after_script: -- docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} sloppylopez/docker_elk_stack -- docker images -- docker push sloppylopez/docker_elk_stack - echo "TRAVIS_PULL_REQUEST ${TRAVIS_PULL_REQUEST}" - echo "TRAVIS_BRANCH ${TRAVIS_BRANCH}" +- docker login -e ${DOCKER_EMAIL} -u ${DOCKER_USER} -p ${DOCKER_PASSWORD} +- docker images +- docker push sloppylopez/docker_elk_stack after_success: env: global: