Fixed CI for branches and PRs
#!/bin/bash
-if [ "$TRAVIS_PULL_REQUEST" = "true" ]; then
- docker buildx build --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x .
- return $?
+if [ "$TRAVIS_PULL_REQUEST" = "true" ] || [ "$TRAVIS_BRANCH" != "master" ]; then
+ docker buildx build \
+ --progress plain \
+ --platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \
+ .
+ exit $?
fi
echo $DOCKER_PASSWORD | docker login -u qmcgaw --password-stdin &> /dev/null
-TAG="$TRAVIS_BRANCH"
-if [ "$TAG" = "master" ]; then
TAG="${TRAVIS_TAG:-latest}"
-fi
echo "Building Docker images for \"$DOCKER_REPO:$TAG\""
docker buildx build \
+ --progress plain \
--platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \
--build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \
--build-arg VCS_REF=`git rev-parse --short HEAD` \
