From 442acfc112c7230371bfcf68d7ed7f2feec5fea0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= Date: Sun, 22 Apr 2018 03:53:51 +0200 Subject: [PATCH 1/4] #44 Nightly builds --- .travis.yml | 3 +++ Makefile | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/.travis.yml b/.travis.yml index 27e429f8..5fd5bafc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -19,3 +19,6 @@ script: after_script: - docker images - docker run -it --rm jakzal/phpqa:$flavour sh -c 'php /usr/local/bin/tools.php update-phars && diff $TOOLS_JSON.bak $TOOLS_JSON || echo -e "\033[0;91mSome tools might have new phar releases. Update tools.json.\033[0m"' + +after_success: + - if [[ "$TRAVIS_BRANCH" == "master" ]];then make build-nightly; fi diff --git a/Makefile b/Makefile index 2ece4ae6..1d2c08a4 100644 --- a/Makefile +++ b/Makefile @@ -11,3 +11,9 @@ build-alpine: docker build -f Dockerfile-alpine -t jakzal/phpqa:alpine . .PHONY: build-alpine + +NIGHTLY_TAG := jakzal/phpqa:nightly-$(shell date +%y%m%d) +build-nightly: + docker build -t $(NIGHTLY_TAG) . + @docker login -u ${DOCKERHUB_LOGIN} -p ${DOCKERHUB_PASSWORD} + docker push $(NIGHTLY_TAG) From b7546a10f2052d76a80768231d49d581477396fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= Date: Tue, 24 Apr 2018 23:19:19 +0200 Subject: [PATCH 2/4] trigger nightly build via cron only --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5fd5bafc..a66fb2ce 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,4 @@ after_script: - docker run -it --rm jakzal/phpqa:$flavour sh -c 'php /usr/local/bin/tools.php update-phars && diff $TOOLS_JSON.bak $TOOLS_JSON || echo -e "\033[0;91mSome tools might have new phar releases. Update tools.json.\033[0m"' after_success: - - if [[ "$TRAVIS_BRANCH" == "master" ]];then make build-nightly; fi + - [ "$TRAVIS_EVENT_TYPE" = "cron" ] && make build-nightly From 1996fea4b29b5c144c1f6d716f2600b4d9a13448 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Tue, 1 May 2018 10:59:10 +0100 Subject: [PATCH 3/4] Include alpine in nightly builds --- .travis.yml | 6 +++++- Makefile | 12 ++++++++++-- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index a66fb2ce..8fe5c8e8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,4 +21,8 @@ after_script: - docker run -it --rm jakzal/phpqa:$flavour sh -c 'php /usr/local/bin/tools.php update-phars && diff $TOOLS_JSON.bak $TOOLS_JSON || echo -e "\033[0;91mSome tools might have new phar releases. Update tools.json.\033[0m"' after_success: - - [ "$TRAVIS_EVENT_TYPE" = "cron" ] && make build-nightly + - [ "$TRAVIS_EVENT_TYPE" = "cron" ] && (if [ "$flavour" = "latest" ]; then make build-nightly; else make build-nightly-alpine; fi) + +env: + - secure: "jb4NZs3rbbJEwXFtZV7aZo5ZFdwxb6RaugDefv1XnXkoDBWejYGzZZRnbybID8K5adMvmO4GiyvGyjy/Augt4BziSoBQbYdablBA/tKCeAmoreDwDPSFUv65KM4OXfBbeOOCryDHWBObPzkfRk3djQqcvO+6+Kstixp19/t1+Gr8lWSYhYMUXzgvZLUKg3yeQW8jGcMrfgiAeG+l4Gc7Uqnegcd7mjopaeWP6KOK+5dlV8PrhoE1R2B/dHX+FagJfGwgfp8x9FKMdr9Y0iGowbqwj/AuG/5HSsflfqWNXVprMmKCpHLZP+s614RW91gcI37IfQU2C3Zf4CEIp1bKIgfxTIlCDnTbltjQoQw51K9SqJLYYqgCb2aRPnJeLPBwoJw50dBKW4PvrGp9treGIdBm8tBSTOgTODI7hucR2QJmVUzsbJa8Rgb3WigoPKJGD+KNbygSMLJi0r0I6k3+kqkLWpyNuLhrzENUWRYT69qcSwRf4DzhPB9cLH9aGYnvko47gtNSd7I1eD84HhKb8gQx+tqLK1dkQNBvPKySkp6kJH3p87z+KY1+A0umDbAoqw0GcT3d3UmitkGUGB1WQzrwD6bIUlIxbDa5vCKQefWmxm4thxiMVKcXblSRTPiw68h8/tmfwRpF2vwMhfUFYz83CsxpWL8J8u0oWAhIeW8=" + - secure: "iO9RzZwdZiq/txA3qaKrcEgGePvBaIEQd9Znh4JMNlynunJ21ewgqzFKYlDejEqdc3Q9KCwDSlfXSaJ1mNPWxyEjBcdVWNe/IRj5+5U/bbczio4mKZ7dfw/ocCjlpeSkmCyPF3CwKmcybzWk9wQiWZkXrGdwdfzdwWgfmDb/gKzrDO3LQtEalnSiqAu8E7aE5Mwrul+0zn1IqHU3zu46GPYfs7hOpgNXg7v3L/GT8L/WGbTzRwDN0miNewxiY61J4U9ktyTeOk4mX01+lACTZuJCQe9ZKX2MatY8Bs+O9RxQSK2EAAZ4Pi25Yim9g/ry+FaV4a6K+4u/zvQKwZLjW96Hm8+/1gGfYecPOXzw7FUEEow+xzY5jyAuQpGATrXRiay7sT1bQlS6Ga7t2KATS0ifgatzDGK3LRFzlcXJkO2lD5z3uH7M5ft9eVUkVtr51BtP5Q7vwv26uq/+0/NS+9vVZe9XzK1Ew4SpdU3Z0Y7mJH4PrOTkjIOC+8j1Xu+FcqVynEzsUn1l3Bka+Y0bICekU6QrzFn1PfhRBypZHy/k0gndhXBvGXAU9qA4QscMDwdSMAjMDC/i1D/qOk5KeGHoG6/CtocMLXXB+k8MCLA0LX6uHRMEqUgIUyEKX+14luFBeMbfUCOF1cXozqOOVZnm4pgSJMddl3+AvRaQIq0=" diff --git a/Makefile b/Makefile index 1d2c08a4..9e1f2cc4 100644 --- a/Makefile +++ b/Makefile @@ -12,8 +12,16 @@ build-alpine: .PHONY: build-alpine -NIGHTLY_TAG := jakzal/phpqa:nightly-$(shell date +%y%m%d) +NIGHTLY_TAG := jakzal/phpqa-nightly:$(shell date +%y%m%d) build-nightly: docker build -t $(NIGHTLY_TAG) . - @docker login -u ${DOCKERHUB_LOGIN} -p ${DOCKERHUB_PASSWORD} + @docker login -u ${DOCKER_HUB_LOGIN} -p ${DOCKER_HUB_PASSWORD} docker push $(NIGHTLY_TAG) +.PHONY: build-nightly + +NIGHTLY_ALPINE_TAG := jakzal/phpqa-nightly:$(shell date +%y%m%d)-alpine +build-nightly-alpine: + docker build -f Dockerfile-alpine -t $(NIGHTLY_ALPINE_TAG) . + @docker login -u ${DOCKER_HUB_LOGIN} -p ${DOCKER_HUB_PASSWORD} + docker push $(NIGHTLY_ALPINE_TAG) +.PHONY: build-nightly-alpine From 8969e04a6bd746885d018759b1c989d808f8a9f3 Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Tue, 1 May 2018 11:13:15 +0100 Subject: [PATCH 4/4] Link to both docker hub repositories --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 268ec4e1..9bca6daf 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,10 @@ Docker image providing static analysis tools for PHP. [![Build Status](https://travis-ci.org/jakzal/phpqa.svg?branch=master)](https://travis-ci.org/jakzal/phpqa) +Docker hub repository: https://hub.docker.com/r/jakzal/phpqa/ + +Nightly builds: https://hub.docker.com/r/jakzal/phpqa-nightly/ + ## Available tools * composer - [Dependency Manager for PHP](https://getcomposer.org/)