Merge pull request #370 from nextcloud/fix-travis

Add pgp-happy-eyeballs to travis
This commit is contained in:
Tilo Spannagel 2018-06-19 10:17:05 +02:00 committed by GitHub
commit ebfcbfb255
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -14,13 +14,19 @@ install:
before_script: before_script:
- env | sort - env | sort
- wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
- image="nextcloud:${VERSION}${VARIANT:+-$VARIANT}" - image="nextcloud:${VERSION}${VARIANT:+-$VARIANT}"
- if [[ "$ARCH" == 'i386' ]]; then sed -i -e 's/FROM php/FROM i386\/php/g' "${VERSION}/${VARIANT}/Dockerfile"; fi - if [[ "$ARCH" == 'i386' ]]; then sed -i -e 's/FROM php/FROM i386\/php/g' "${VERSION}/${VARIANT}/Dockerfile"; fi
script: script:
- travis_retry docker build -t "$image" "${VERSION}/${VARIANT}" - |
- ~/official-images/test/run.sh "$image" (
- .travis/test-example-dockerfiles.sh "$image" set -Eeuo pipefail
set -x
docker build -t "$image" "${VERSION}/${VARIANT}"
~/official-images/test/run.sh "$image"
.travis/test-example-dockerfiles.sh "$image"
)
after_script: after_script:
- docker images - docker images