diff options
| author | Lauri Ojansivu <x@xet7.org> | 2017-03-28 20:50:42 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 20:50:42 +0300 |
| commit | 3ccc61957c4c6a0c15a8bdeb68653b94a95efeb1 (patch) | |
| tree | 141105ecd1dca12eb099981a9db0bdc988622a85 | |
| parent | ca7be3a162366c2d05933c8f365a03e978e06f4d (diff) | |
| parent | 0c11096a57e48100f75f70e9a72099e8a685d7a5 (diff) | |
| download | wekan-3ccc61957c4c6a0c15a8bdeb68653b94a95efeb1.tar.gz wekan-3ccc61957c4c6a0c15a8bdeb68653b94a95efeb1.tar.bz2 wekan-3ccc61957c4c6a0c15a8bdeb68653b94a95efeb1.zip | |
Merge pull request #942 from stephenmoloney/devel
user high availability key server and update travis.yml for docker builds
| -rw-r--r-- | .travis.yml | 19 | ||||
| -rw-r--r-- | Dockerfile | 16 |
2 files changed, 26 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index db105d0a..9a760beb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,25 @@ -sudo: false +sudo: required + +env: + DOCKER_COMPOSE_VERSION: 1.11.2 + +before_install: + - sudo curl -fsSL https://get.docker.com/ | sh + - if [ -e /usr/local/bin/docker-compose ]; then sudo rm /usr/local/bin/docker-compose; fi + - sudo curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose + - sudo chmod +x docker-compose + - sudo mv docker-compose /usr/local/bin + - sudo docker-compose build --no-cache --force-rm + - sudo docker-compose up && docker ps -a + - sudo docker run wekan-app /bin/sh -c "npm test" + language: node_js + node_js: - "0.10.48" + install: - "npm install" + script: - "npm test" @@ -44,14 +44,14 @@ RUN \ # Verify nodejs authenticity grep ${NODE_VERSION}-${ARCHITECTURE}.tar.gz SHASUMS256.txt.asc | shasum -a 256 -c - && \ export GNUPGHOME="$(mktemp -d)" && \ - gpg --keyserver pool.sks-keyservers.net --recv-keys 9554F04D7259F04124DE6B476D5A82AC7E37093B && \ - gpg --keyserver pool.sks-keyservers.net --recv-keys 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 && \ - gpg --keyserver pool.sks-keyservers.net --recv-keys FD3A5288F042B6850C66B31F09FE44734EB7990E && \ - gpg --keyserver pool.sks-keyservers.net --recv-keys 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 && \ - gpg --keyserver pool.sks-keyservers.net --recv-keys DD8F2338BAE7501E3DD5AC78C273792F7D83545D && \ - gpg --keyserver pool.sks-keyservers.net --recv-keys C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 && \ - gpg --keyserver pool.sks-keyservers.net --recv-keys B9AE9905FFD7803F25714661B63B535A4C206CA9 && \ - gpg --refresh-keys pool.sks-keyservers.net && \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 9554F04D7259F04124DE6B476D5A82AC7E37093B && \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 94AE36675C464D64BAFA68DD7434390BDBE9B9C5 && \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys FD3A5288F042B6850C66B31F09FE44734EB7990E && \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 && \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys DD8F2338BAE7501E3DD5AC78C273792F7D83545D && \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 && \ + gpg --keyserver ha.pool.sks-keyservers.net --recv-keys B9AE9905FFD7803F25714661B63B535A4C206CA9 && \ + gpg --refresh-keys ha.pool.sks-keyservers.net && \ gpg --verify SHASUMS256.txt.asc && \ rm -R "$GNUPGHOME" SHASUMS256.txt.asc && \ \ |