Skip to content

Commit

Permalink
Merge pull request #370 from nextcloud/fix-travis
Browse files Browse the repository at this point in the history
Add pgp-happy-eyeballs to travis
  • Loading branch information
tilosp committed Jun 19, 2018
2 parents 5ea9f6b + af3787d commit ebfcbfb
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,19 @@ install:

before_script:
- env | sort
- wget -qO- 'https://github.com/tianon/pgp-happy-eyeballs/raw/master/hack-my-builds.sh' | bash
- image="nextcloud:${VERSION}${VARIANT:+-$VARIANT}"
- if [[ "$ARCH" == 'i386' ]]; then sed -i -e 's/FROM php/FROM i386\/php/g' "${VERSION}/${VARIANT}/Dockerfile"; fi

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:
- docker images
Expand Down

0 comments on commit ebfcbfb

Please sign in to comment.