diff --git a/.travis.yml b/.travis.yml index 0d5392a..ada7365 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,24 +1,30 @@ -udo: required +sudo: 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 +- 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: +- docker version +- docker-compose version 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}" +- 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: + - 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/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 diff --git a/install_prerequisites.sh b/install_prerequisites.sh index ac8b45b..8305299 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_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 chmod +x /usr/local/bin/docker-compose diff --git a/install_prerequisites_mac.sh b/install_prerequisites_mac.sh index 17580d9..682fc90 100644 --- a/install_prerequisites_mac.sh +++ b/install_prerequisites_mac.sh @@ -2,6 +2,14 @@ #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 DOCKER_EMAIL= --add +travis encrypt DOCKER_USER= --add +travis encrypt DOCKER_PASSWORD= --add #Check installed versions docker --version docker-compose --version