Safer docker login and fails on any command in travis

This commit is contained in:
Quentin McGaw
2019-04-26 12:54:09 +02:00
parent 4249d1469e
commit cc36ba5207
2 changed files with 6 additions and 7 deletions
+2 -4
View File
@@ -1,6 +1,4 @@
.git .git
.travis.yml
readme readme
tun.sh *.yml
docker-compose.yml *.md
README.md
+3 -2
View File
@@ -16,9 +16,10 @@ env:
BASE_IMAGE=arm64v8/alpine BASE_IMAGE=arm64v8/alpine
TARGET_IMAGE=${DOCKER_BUILD}:${ARCH} TARGET_IMAGE=${DOCKER_BUILD}:${ARCH}
script: script:
- docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" - set -e
- echo "$DOCKER_PASSWORD" | docker login -u qmcgaw --password-stdin
- docker run --rm --privileged multiarch/qemu-user-static:register --reset - docker run --rm --privileged multiarch/qemu-user-static:register --reset
- docker build -t ${TARGET_IMAGE} --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg VCF=${TRAVIS_COMMIT} --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" . - docker build -t ${TARGET_IMAGE} --build-arg BASE_IMAGE=${BASE_IMAGE} --build-arg VCF=${TRAVIS_COMMIT} --build-arg BUILD_DATE="$(date -u +"%Y-%m-%dT%H:%M:%SZ")" .
- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && docker push ${DOCKER_BUILD} || false' - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] && docker push ${DOCKER_BUILD} || false'
after_script:
- "curl -X POST https://hooks.microbadger.com/images/${DOCKER_BUILD}/${MICROBADGER_CODE}" - "curl -X POST https://hooks.microbadger.com/images/${DOCKER_BUILD}/${MICROBADGER_CODE}"