From f86abcfe5e0eaa1becffc10193823750d7046be2 Mon Sep 17 00:00:00 2001 From: Edu Herraiz Aparicio Date: Fri, 10 Jun 2016 16:45:23 +0200 Subject: [PATCH] Push on master and thumbor version registry, if commit directly on master --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 897b0a19..86d675c0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,7 @@ notifications: - gshark@gmail.com env: global: - - THUMBOR_VERSION=6.0.1 + - THUMBOR_VERSION=6.0.2 - secure: LSNYgDagNJrEBIZtAMXgGNaza66WniJNWVYpeZ00bxrqF2AJ/NLt9FGGvySDwJHcgqgD0SbsxD7EAefuZlBNq/68qvHFtnNZb5FoU6gjXW9Kvdlvtt6r5zcTvrPDwAlaGUi6iDnTxNd1YK+dQ5M5QPk6Vr3yAU2Pd/SjQtDTZU9TIUPIU2PHkzf/3mOV2VXrwfN4SR1XDe15Dk/dofDc0GWfvSQUedUZzEYGOT4yg5CNa1Zps10tD5rEsGaYoiBfJyTNaaXPufGbytqrJ0OyLXtkKevcVGQcCZn2RrBqwMatuOMdlsx5UxHbxSCHngtwQgIE7nKsuSQupW4R8MK9RmSWPy34rbaBAb3qWYBrmEQxBSeVFDShML+wunMWwjJ2Spugc4ER71PX4O97GtQB/4H9EyEFuDO9MnEIHX6GpRCS21NHVXUVAdrAHXfTGZBIvrOcAHh9y1idHeCsF92X0qBNkC+MNaAxWV+gvCZ+sZpDKrfoUMDI+nxff5B/Cb33++9iv4gWz01GJDVmK6YyTT0/6+KzHNU0mp7ji7wgvlTUDYCSTR1+11R9Aoalt07KfMJS1gGG8HuMFcSCV7z1btxWZUWKpC6WydXwJuVyQZg7g6HYJEEHxtpP8z81FWLhGQWk3qMpi5kxZrqDQ7IES8ibK1o1tyFMUCn0Jdm6Uyo= - secure: JHQ1g7ZWuO5IQhPd915so8pBPfMNp00rRRvNmewHaUXO33UnC6g1pFkTKsx5QpDi0QxdH0o0DYOXB1nvd1Y/cO3spW5P2dV0kfftr2GUTGKf6WTakZPfqowvZN6YKA+rI7eFaGnhrVLhzKhK5T5Gu9UHklPlndo6LvQxqQBuYI2uggSTK4M4zD5XWqEe6o0RJ89y6xX7DyqLKIkXF3N/RcoHLh7GSfNZNdaN/u/Nb1fQKTYIOiMVIPYYNm1DU4c/jsIxxJhxC60DgavC5rwCLQg5FXT5vQ6Ky41JRR0U3a23US3E0wMaHP1LvHP9o4jfFeA6pLG7zgceGkY+IKlsWPT2pr3nR71xCHEtZe2tPvAlwvgwIngliM06SIGrk0s5yuhD6Qvug9/DfAe96gD557WYEXXnT++ByW/+gGq3kiWBQlMqg9Z8N15WIA0qe+LUrkmw9MiuWkJyR3hP0Kidl/pv0AAM0oqqGuLiruPAsetk24lT2zh77t4wOI1jyGUwaqVHUlRHOegflXcRh9eAsBHFmXDJEkqLDs4yJ+oeMUnLyoLy24xJ1hvx41oVGbIQL0qTIikkN5i9qAU0hX8ZoBOwQN+WoffNC2+tEX0cDhTugKIg3YzHkHqYDmplCsElP8PAuCzxl0/P8W4CtHqn9F0FO+CgW3HLit9jJfHFYeA= - secure: b1+J/WngVLdn37ubp7iJLGHY3X5j95Ewk60mYOy4FAfdb6ofK6dtOUXTGHNjqMNsZDoZShjuFvB3+Qrz5VSzx2JT/R+hgqdr08Ft8powZYUPJUOBih+mZAo1ACgxhn/jHQsp/OUkD4Qe0PGRVqva10HQP55+SINH605b9/HGQdQwGhI++kvsqLaQZVcdKtFyetF+RkY70rXAsite53zd++2FYScvsjuf0ie5BTmPTyoOs1Cq8w1/+xVSb911F5m1KIJg8Z3O1zXL1XJ2IXAHoVGxuoCeGNw61RKEMp3VGZPeX/TBvFSbQ5alShmxgS6GPAcZFsWX/Lv6CdYOWoXjDKCTfrgvoElcn8AvBoZiNDf9aegnHZooHskoA4Bi+Tj83TDoZvB1qQvLWhD/ldZl+/9gBj/f3zO8FECK+RTDeN5MNgKWs/eg8lU9D1JRYw2JkN+AADUZlJXGZiZHGQDh03rsSfb0C4LpwulZwEWCTB5s1y22WwI+1Ec+S4TajqPInojn45qUIyH0sf/JPVYpCYAbbQWugwz+rrvuv90rPYNI8m73Fv2jk5a57P5t4+UBGS6UNfq8Kyj5d/b/hRznT4lvE3hvPwRjo07C4m+hPAJgPuRnFCZhaJ4E6b9zgdgKitaz/xGiosn2O4Y2apT5mNcgbHEq1v0j+P19CxDqDHg= @@ -30,9 +30,12 @@ env: - DOCKER_COMPOSE_VERSION=1.7.1 after_success: - docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS -- export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $THUMBOR_VERSION; fi` -- docker push apsl/thumbor:$TAG -- docker push apsl/remotecv:$TAG -- docker push apsl/thumbor-multiprocess:$TAG -- docker push apsl/thumbor-nginx:$TAG +- docker push apsl/thumbor:$THUMBOR_VERSION +- if [ "$TRAVIS_BRANCH" == "master" ]; then docker push apsl/thumbor:latest ; fi; +- docker push apsl/remotecv:$THUMBOR_VERSION +- if [ "$TRAVIS_BRANCH" == "master" ]; then docker push apsl/remotecv:latest ; fi; +- docker push apsl/thumbor-multiprocess:$THUMBOR_VERSION +- if [ "$TRAVIS_BRANCH" == "master" ]; then docker push apsl/multiprocess:latest ; fi; +- docker push apsl/thumbor-nginx:$THUMBOR_VERSION +- if [ "$TRAVIS_BRANCH" == "master" ]; then docker push apsl/thumbor-nginx:latest ; fi; - docker images -a \ No newline at end of file