Going back to single travis job for docker image building

This commit is contained in:
Alejandro Celaya 2020-05-16 22:01:20 +02:00
parent 3c3a30cc0e
commit 17f3897746
2 changed files with 6 additions and 16 deletions

View file

@ -7,29 +7,19 @@ branches:
- /.*/
jobs:
fast_finish: true
include:
- name: "Docker publish - linux/arm/v7"
- name: "Docker publish"
php: '7.4'
if: NOT type = pull_request
env:
- DOCKER_PUBLISH="true"
- PLATFORM="linux/arm/v7"
- name: "Docker publish - linux/arm64/v8"
php: '7.4'
if: NOT type = pull_request
env:
- DOCKER_PUBLISH="true"
- PLATFORM="linux/arm64/v8"
- name: "Docker publish - linux/amd64"
php: '7.4'
if: NOT type = pull_request
env:
- DOCKER_PUBLISH="true"
- PLATFORM="linux/amd64"
- name: "CI"
php: '7.4'
env:
- DOCKER_PUBLISH="false"
allow_failures:
- name: "Docker publish"
services:
- docker

View file

@ -21,12 +21,12 @@ if [[ ! -z $TRAVIS_TAG ]]; then
docker buildx build --push \
--build-arg SHLINK_VERSION=${TRAVIS_TAG#?} \
--platform ${PLATFORM} \
--platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
${TAGS} .
# If build branch is develop, build latest (on master, when there's no tag, do not build anything)
elif [[ "$TRAVIS_BRANCH" == 'develop' ]]; then
docker buildx build --push \
--platform ${PLATFORM} \
--platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
-t shlinkio/shlink:latest .
fi