admin/gluetun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed CI for branches and PRs (#64)

Browse Source
This commit is contained in:
Quentin McGaw
2019-12-20 07:40:39 -05:00
committed by GitHub
parent 73cef63e73
commit 9b26a39690
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ci.sh
View File

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