From 142f01098be72aa416556f8981c652954e219a6a Mon Sep 17 00:00:00 2001 From: oznu Date: Tue, 11 Feb 2020 12:30:49 +1100 Subject: [PATCH] update travis build --- .travis.yml | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index dd51999..3ba3035 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,26 @@ services: - docker env: - - DOCKERFILE="Dockerfile" TAG_SUFFIX="amd64" BUILDX_PALTFORM="linux/arm" + - DOCKERFILE="Dockerfile" TAG_SUFFIX="amd64" - DOCKERFILE="Dockerfile.raspberry-pi" TAG_SUFFIX="arm32v5" ALT_SUFFIX="armhf" +matrix: + include: + # amd64 + - os: linux + arch: amd64 + env: + - DOCKERFILE="Dockerfile" + - TAG_SUFFIX="amd64" + + # arm32v5 + - os: linux + arch: arm64 + env: + - DOCKERFILE="Dockerfile.raspberry-pi" + - TAG_SUFFIX="arm32v5" + - ALT_SUFFIX="armhf" + before_script: # update docker to edge - sudo apt update -y @@ -13,7 +30,7 @@ before_script: script: - export TARGET_IMAGE_TAG=$(if [ "$TRAVIS_BRANCH" = "master" ]; then if [ "$TAG_SUFFIX" = "" ]; then echo "latest"; else echo "$TAG_SUFFIX"; fi; else if [ "$TAG_SUFFIX" = "" ]; then echo "$TRAVIS_BRANCH"; else echo "$TRAVIS_BRANCH-$TAG_SUFFIX"; fi; fi) - docker pull $TARGET_IMAGE:$TARGET_IMAGE_TAG && export IMAGE_CACHE="--cache-from $TARGET_IMAGE:$TARGET_IMAGE_TAG" || export IMAGE_CACHE="" - - docker buildx build --platform $BUILDX_PALTFORM -f $DOCKERFILE $IMAGE_CACHE -t $TARGET_IMAGE:$TARGET_IMAGE_TAG . + - docker build -f $DOCKERFILE $IMAGE_CACHE -t $TARGET_IMAGE:$TARGET_IMAGE_TAG . - docker login --username $DOCKER_USERNAME --password $DOCKER_PASSWORD - docker push $TARGET_IMAGE:$TARGET_IMAGE_TAG