diff --git a/.travis.yml b/.travis.yml index 622338d5..07e500ea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -54,7 +54,7 @@ install: before_script: - docker-compose exec shlink_db_ms /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P 'Passw0rd!' -Q "CREATE DATABASE shlink_test;" - mkdir build - - export DOCKERFILE_CHANGED=$(git diff ${TRAVIS_COMMIT_RANGE:-origin/master} --name-only | grep Dockerfile) + - export DOCKERFILE_CHANGED=$(git diff ${TRAVIS_COMMIT_RANGE:-origin/main} --name-only | grep Dockerfile) script: - bin/test/run-api-tests.sh --coverage-php build/coverage-api.cov && composer ci diff --git a/README.md b/README.md index 4a7e25f6..f8a1990a 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -![Shlink](https://raw.githubusercontent.com/shlinkio/shlink.io/master/public/images/shlink-hero.png) +![Shlink](https://raw.githubusercontent.com/shlinkio/shlink.io/main/public/images/shlink-hero.png) [![Build Status](https://img.shields.io/travis/shlinkio/shlink.svg?style=flat-square)](https://travis-ci.org/shlinkio/shlink) -[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/?branch=master) -[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/?branch=master) +[![Code Coverage](https://img.shields.io/scrutinizer/coverage/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/) +[![Scrutinizer Code Quality](https://img.shields.io/scrutinizer/g/shlinkio/shlink.svg?style=flat-square)](https://scrutinizer-ci.com/g/shlinkio/shlink/) [![Latest Stable Version](https://img.shields.io/github/release/shlinkio/shlink.svg?style=flat-square)](https://packagist.org/packages/shlinkio/shlink) [![Docker pulls](https://img.shields.io/docker/pulls/shlinkio/shlink.svg?style=flat-square)](https://hub.docker.com/r/shlinkio/shlink/) -[![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/master/LICENSE) +[![License](https://img.shields.io/github/license/shlinkio/shlink.svg?style=flat-square)](https://github.com/shlinkio/shlink/blob/main/LICENSE) [![Paypal donate](https://img.shields.io/badge/Donate-paypal-blue.svg?style=flat-square&logo=paypal&colorA=aaaaaa)](https://slnk.to/donate) A PHP-based self-hosted URL shortener that can be used to serve shortened URLs under your own custom domain. diff --git a/docker/README.md b/docker/README.md index 9526dd25..89c9565b 100644 --- a/docker/README.md +++ b/docker/README.md @@ -291,6 +291,6 @@ Versioning on this docker image works as follows: * `X.X.X`: when providing a specific version number, the image version will match the shlink version it contains. For example, installing `shlinkio/shlink:1.15.0`, you will get an image containing shlink v1.15.0. * `stable`: always holds the latest stable tag. For example, if latest shlink version is 2.0.0, installing `shlinkio/shlink:stable`, you will get an image containing shlink v2.0.0 -* `latest`: always holds the latest contents in master, and it's considered unstable and not suitable for production. +* `latest`: always holds the latest contents, and it's considered unstable and not suitable for production. > **Important**: The docker image was introduced with shlink v1.15.0, so there are no official images previous to that versions. diff --git a/docker/build b/docker/build index 8ac27d4d..a2855fdf 100755 --- a/docker/build +++ b/docker/build @@ -27,7 +27,7 @@ if [[ ! -z $TRAVIS_TAG ]]; then --platform ${PLATFORMS} \ ${TAGS} . -# If build branch is develop, build latest (on master, when there's no tag, do not build anything) +# If build branch is develop, build latest (on main branch, when there's no tag, do not build anything) elif [[ "$TRAVIS_BRANCH" == 'develop' ]]; then docker buildx build --push \ --platform ${PLATFORMS} \