Merge pull request #282 from containous/fix-openssl-travis

Fix openssl travis
This commit is contained in:
Vincent Demeester 2016-04-05 22:24:25 +02:00
commit 5fcce6567e
3 changed files with 16 additions and 9 deletions

View file

@ -11,12 +11,6 @@ sudo: required
services: services:
- docker - docker
before_install:
- openssl aes-256-cbc -K $encrypted_27087ae1f4db_key -iv $encrypted_27087ae1f4db_iv -in .travis/traefik.id_rsa.enc -out ~/.ssh/traefik.id_rsa -d
- eval "$(ssh-agent -s)"
- chmod 600 ~/.ssh/traefik.id_rsa
- ssh-add ~/.ssh/traefik.id_rsa
install: install:
- sudo service docker stop - sudo service docker stop
- sudo curl https://get.docker.com/builds/Linux/x86_64/docker-1.10.1 -o /usr/bin/docker - sudo curl https://get.docker.com/builds/Linux/x86_64/docker-1.10.1 -o /usr/bin/docker

View file

@ -41,7 +41,7 @@ Run it and forget it!
## Features ## Features
- [It's fast](docs/index.md#benchmarks) - [It's fast](http://docs.traefik.io/benchmarks)
- No dependency hell, single binary made with go - No dependency hell, single binary made with go
- Rest API - Rest API
- Multiple backends supported: Docker, Mesos/Marathon, Consul, Etcd, and more to come - Multiple backends supported: Docker, Mesos/Marathon, Consul, Etcd, and more to come

View file

@ -2,24 +2,36 @@
set -e set -e
if ([ "$TRAVIS_BRANCH" = "master" ] || [ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then if ([ "$TRAVIS_BRANCH" = "master" ] || [ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" = "false" ]; then
echo "Deploying" echo "Deploying..."
else else
echo "Skipping deploy" echo "Skipping deploy"
exit 0 exit 0
fi fi
curl -LO https://github.com/tcnksm/ghr/releases/download/pre-release/linux_amd64.zip # load ssh key
echo "Loading key..."
openssl aes-256-cbc -K $encrypted_27087ae1f4db_key -iv $encrypted_27087ae1f4db_iv -in .travis/traefik.id_rsa.enc -out ~/.ssh/traefik.id_rsa -d
eval "$(ssh-agent -s)"
chmod 600 ~/.ssh/traefik.id_rsa
ssh-add ~/.ssh/traefik.id_rsa
# download github release
echo "Downloading ghr..."
curl -LOs https://github.com/tcnksm/ghr/releases/download/pre-release/linux_amd64.zip
unzip -q linux_amd64.zip unzip -q linux_amd64.zip
sudo mv ghr /usr/bin/ghr sudo mv ghr /usr/bin/ghr
sudo chmod +x /usr/bin/ghr sudo chmod +x /usr/bin/ghr
# github release and tag # github release and tag
echo "Github release..."
ghr -t $GITHUB_TOKEN -u containous -r traefik --prerelease ${VERSION} dist/ ghr -t $GITHUB_TOKEN -u containous -r traefik --prerelease ${VERSION} dist/
# update docs.traefik.io # update docs.traefik.io
echo "Generating and updating documentation..."
mkdocs gh-deploy --clean mkdocs gh-deploy --clean
# update traefik-library-image repo (official Docker image) # update traefik-library-image repo (official Docker image)
echo "Updating traefik-library-imag repo..."
git config --global user.email "emile@vauge.com" git config --global user.email "emile@vauge.com"
git config --global user.name "Emile Vauge" git config --global user.name "Emile Vauge"
git clone git@github.com:containous/traefik-library-image.git git clone git@github.com:containous/traefik-library-image.git
@ -31,6 +43,7 @@ echo $VERSION | git tag -a $VERSION --file -
git push -q --follow-tags -u origin master git push -q --follow-tags -u origin master
# create docker image emilevauge/traefik (compatibility) # create docker image emilevauge/traefik (compatibility)
echo "Updating docker emilevauge/traefik image..."
docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_PASS
docker tag containous/traefik emilevauge/traefik:latest docker tag containous/traefik emilevauge/traefik:latest
docker push emilevauge/traefik:latest docker push emilevauge/traefik:latest