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

Fixed and improved CI script

Browse Source
This commit is contained in:
Quentin McGaw (desktop)
2020-02-25 11:47:08 +00:00
parent dd0170afb1
commit 9ada201b82
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ci.sh
View File

@@ -1,23 +1,24 @@
#!/bin/bash #!/bin/bash
echo -e "\n\nPull request: $TRAVIS_PULL_REQUEST\nRelease tag: $TRAVIS_TAG\nBranch: $TRAVIS_BRANCH\n\n" ARCHS=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x
if [ ! -z "$TRAVIS_PULL_REQUEST" ]; then echo -e "\n\nPull request: $TRAVIS_PULL_REQUEST\nRelease tag: $TRAVIS_TAG\nBranch: $TRAVIS_BRANCH\n\nTarget arch: $ARCHS\n\n"
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
echo -e "\n\nBuilding pull request without pushing to Docker Hub\n\n" echo -e "\n\nBuilding pull request without pushing to Docker Hub\n\n"
docker buildx build \ docker buildx build \
--progress plain \ --progress plain \
--platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \ --platform="$ARCHS" \
. .
exit $? exit $?
fi fi
echo $DOCKER_PASSWORD | docker login -u qmcgaw --password-stdin 2>&1 | tail -n 1 echo $DOCKER_PASSWORD | docker login -u qmcgaw --password-stdin 2>&1
TAG="$TRAVIS_TAG" TAG="$TRAVIS_TAG"
if [ -z $TAG ]; then if [ -z "$TAG" ]; then
if [ "$TRAVIS_BRANCH" = "master" ]; then TAG=latest
TAG=latest if [ "$TRAVIS_BRANCH" != "master" ]; then
else
TAG="$TRAVIS_BRANCH" TAG="$TRAVIS_BRANCH"
fi fi
fi fi
@@ -25,7 +26,7 @@ fi
echo -e "\n\nBuilding Docker images for \"$DOCKER_REPO:$TAG\"\n\n" echo -e "\n\nBuilding Docker images for \"$DOCKER_REPO:$TAG\"\n\n"
docker buildx build \ docker buildx build \
--progress plain \ --progress plain \
--platform=linux/amd64,linux/386,linux/arm64,linux/arm/v7,linux/arm/v6,linux/ppc64le,linux/s390x \ --platform="$ARCHS" \
--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` \
--build-arg VERSION=$TAG \ --build-arg VERSION=$TAG \