diff --git a/.travis.yml b/.travis.yml index 27039d2..27a4ff1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ env: - REPO=bigrob8181/lychee-laravel matrix: - secure: "FXXbM8yDCuf9h17rAyO63XCgI2wJ5EKROY3u1MNxudz54sz3VloZ/SNnVqzdjzYPX9LXfCxVpaDhNLmQtNbqYXg4WBq+5ZuuS0efxFgVaBK0HK6lVoS3/BsJR/U1cglag0Apn2wjFgL3j7d2ZREeG7WIEuDHW5QWcVWhFGWvcAG9JRChFostdde1wbZ6SLTTW2SZFypoRThIdh5PCOnX1oCCmfzeTiCy74uTaiOkkOWsseWeDBy09UrDsFDKd8WX9R7E7g9arv4f9tjzmk1ikQM6Bnfa4YONsY9NjiKFS7/1qfXqg6Z5WfuNr+tW90KrXlk3quCPTn9PEThfqJkgS3BcsLwdhM0OUPx0BXml3RFzYl7jrtj6Wg1vSh6JJIrCh6YrBvg62qRgBs8VPI7QJ60VC56QjhZCiH1YjkjKF0+vVSygC6oJ8wsSciFGu3Cfi4ix6K8iCN90URr6YGl7WOANgfzBTwil/w1Q3IKmzNj6K2UWD+Dm92k/7dkJ2/N5gZ8LUmqhxs5nRzLBZvm77xp/ykRtadP5MHC6HTVHBM6f4tfe6jLWWSi4D8GzQX5sN6Xd2VhvifFsxQeexobhxA918ZjxvUgXHP8mng/WUYccr8DJQmom6uyXpqNpVXGRbjW4CVmgLGBZ05+lgBEmqkyEiXggNRcZipi4E9FICys=" - #- secure: "fbRpdrR5C9NzRppEj8EYzmkEKnZrHng5iq6DRcFocKk+YO4JVKYJhvseVtbnmbxufw44CZcfmwrq5CCF/nec4nSYg0ggNwVX6MtoQFd2CuWvuXBCxBvTk+K/pfNlpEVtTNYoRX00PvIscZMh9RxK6qxQYzIqQLIqbPPsOnvTlVT7DLlr2ba2e35l5l5cgEB8mzZXGH6ghUadx6Xmhh+3S9JA3WXsm14a63fZ3kL8xBh4E2Ed7wlnsJIY3X59RpqxyC8V1+mkAIlCCIeNVtj04gF1cEknQ5CG+HFdUQbqszOlYMkkejYWVoXZeCsKz3ztW9aD2x9K2yBeMeNB6WMtzk2AVtC5QVrSYMsoUWCy/E3mAU84NCV0qYc9cV2xRua4E1AJx83RP8bTzPf5ggsv5G8oZqYsy3S60Jvxa1c/VSCi1t6KDCl+eRuPefUCv0na5WrS0yDEwe+lwJkzyKny7oNxGenejOvVmhPiJti9ZjcuK4AvBg6xe15h/W2EIkWqKvnCZ6NJjpt0cEIcSzJ0p/N5j5n/MjUqUjE3sYcRzMrbYdzVuJbJdApHb5GilRincEwTJ4xhb7iK1TGf7mGSLy9mB3/cZnDga5FLaT7nwOjUX9FcKnimmIvI0jOMVGuXEhsNKzSn2QcuiIpM/qReIPHfOU8eiXmxnkAf+DrYCpw=" language: php @@ -39,8 +38,8 @@ before_script: script: - docker ps -a | awk '{print $NF}' | grep -w $NAME | cat -after_script: - - docker stop $NAME && docker rm $NAME - after_success: - ./deploy.sh + +after_script: + - docker stop $NAME && docker rm $NAME diff --git a/README.md b/README.md index 6247f56..99b8eb8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,7 @@ -[![Build Status](https://travis-ci.com/LycheeOrg/Lychee-Laravel-Docker.svg?branch=master)](https://travis-ci.com/LycheeOrg/Lychee-Laravel-Docker) +[![Build Status](https://img.shields.io/travis/com/LycheeOrg/Lychee-Laravel-Docker/master.svg?style=flat)](https://travis-ci.com/LycheeOrg/Lychee-Laravel-Docker) +[![Docker Pulls](https://img.shields.io/docker/pulls/bigrob8181/lychee-laravel.svg?style=flat)](https://hub.docker.com/r/bigrob8181/lychee-laravel) +[![Release](https://img.shields.io/github/release/LycheeOrg/Lychee-Laravel-Docker.svg?style=flat)](https://github.com/LycheeOrg/Lychee-Laravel-Docker/releases) +![Last Commit](https://img.shields.io/github/last-commit/LycheeOrg/Lychee-Laravel-Docker.svg?style=flat) ## Prerequsites ## @@ -11,6 +14,12 @@ * Supply the environment variables via `docker run` / `docker-compose`, **or** * Create a `.env` file with the appropriate info and mount it to `/conf`. +## Available Docker Tags ## +* **latest**: current stable tag +* **v[NUMBER]**: stable version tag +* **dev**: current master branch tag +* **testing**: branch and pr tag for testing + ## Example docker run command ## 1. **Make sure that you link to the container running your database!!** diff --git a/deploy.sh b/deploy.sh index 32d6ed8..81831df 100644 --- a/deploy.sh +++ b/deploy.sh @@ -2,11 +2,11 @@ docker login -u $REGISTRY_USER -p $REGISTRY_PASS -echo "TRAVIS_BRANCH: $TRAVIS_BRANCH" -echo "TRAVIS_TAG: $TRAVIS_TAG" -echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST" -echo "TRAVIS_EVENT_TYPE: $TRAVIS_EVENT_TYPE" -echo "TRAVIS_PULL_REQUEST_BRANCH: $TRAVIS_PULL_REQUEST_BRANCH" +#echo "TRAVIS_BRANCH: $TRAVIS_BRANCH" +#echo "TRAVIS_TAG: $TRAVIS_TAG" +#echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST" +#echo "TRAVIS_EVENT_TYPE: $TRAVIS_EVENT_TYPE" +#echo "TRAVIS_PULL_REQUEST_BRANCH: $TRAVIS_PULL_REQUEST_BRANCH" # if its a tagged version if [[ -n "$TRAVIS_TAG" ]]; then @@ -27,33 +27,4 @@ else echo "Pushing testing" docker tag $REPO':'$TRAVIS_BUILD_NUMBER $REPO':testing' docker push $REPO':testing' - fi - - -# notes: -# create pr branch = testing - -# create pr = testing -# CI-BRANCH -# TRAVIS_BRANCH: CI-PR2 -# TRAVIS_TAG: -# TRAVIS_PULL_REQUEST: false -# TRAVIS_EVENT_TYPE: push -# TRAVIS_PULL_REQUEST_BRANCH: -# -# CI-PR -# TRAVIS_BRANCH: master -# TRAVIS_TAG: -# TRAVIS_PULL_REQUEST: 7 -# TRAVIS_EVENT_TYPE: pull_request -# TRAVIS_PULL_REQUEST_BRANCH: CI-PR2 - -# merge pr = ? should be dev -# TRAVIS_BRANCH: master -# TRAVIS_TAG: -# TRAVIS_PULL_REQUEST: false -# TRAVIS_EVENT_TYPE: push -# TRAVIS_PULL_REQUEST_BRANCH: - -# create tag = tag/latest