From c1182377dbc4ec8175dd94e416fb28c118a792e2 Mon Sep 17 00:00:00 2001 From: Emile Vauge Date: Thu, 2 Feb 2017 10:58:42 +0100 Subject: [PATCH] Fix travis script (#1067) * Fix travis script Signed-off-by: Emile Vauge * how do i pronounce this damn project Signed-off-by: Emile Vauge * Remove unstable Docker 1.13 tests Signed-off-by: Emile Vauge --- .travis.yml | 83 +++++++++++++++++++++++------------------------- README.md | 2 +- build.Dockerfile | 14 ++++++-- webui/Dockerfile | 7 +++- 4 files changed, 57 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index d526df8d9..7fa34fc4e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,15 +11,15 @@ env: - VERSION: $TRAVIS_TAG - CODENAME: camembert -#addons: -# apt: -# packages: -# - docker-engine=$DOCKER_VERSION.* +matrix: + fast_finish: true + include: + - env: DOCKER_VERSION=1.10.3 + - env: DOCKER_VERSION=1.12.6 before_install: - sudo -E apt-get -yq update - sudo -E apt-get -yq --no-install-suggests --no-install-recommends --force-yes install docker-engine=${DOCKER_VERSION}* - install: - docker version - pip install --user -r requirements.txt @@ -27,44 +27,39 @@ before_script: - make validate - make binary script: - - make test-unit - - make test-integration + - travis_retry make test-unit + - travis_retry make test-integration after_failure: - docker ps - -matrix: - fast_finish: true - include: - - env: DOCKER_VERSION=1.10.3 - - env: DOCKER_VERSION=1.13.0 - - env: DOCKER_VERSION=1.12.6 - after_success: - - make crossbinary - - make image - before_deploy: - - mkdocs build --clean - - tar cfz dist/traefik-${VERSION}.src.tar.gz --exclude-vcs --exclude dist . - deploy: - - provider: pages - edge: true - github_token: ${GITHUB_TOKEN} - local_dir: site - on: - repo: containous/traefik - tags: true - - provider: releases - api_key: ${GITHUB_TOKEN} - file: dist/traefik_* - file_glob: true - on: - repo: containous/traefik - tags: true - - provider: scripts - script: script/deploy.sh - on: - repo: containous/traefik - tags: true - - provider: scripts - script: script/deploy-docker.sh - on: - repo: containous/traefik +after_success: + - make crossbinary + - make image +before_deploy: + - mkdocs build --clean + - tar cfz dist/traefik-${VERSION}.src.tar.gz --exclude-vcs --exclude dist . +deploy: + - provider: pages + edge: true + github_token: ${GITHUB_TOKEN} + local_dir: site + skip_cleanup: true + on: + repo: containous/traefik + tags: true + - provider: releases + api_key: ${GITHUB_TOKEN} + file: dist/traefik* + skip_cleanup: true + file_glob: true + on: + repo: containous/traefik + tags: true + - provider: script + script: script/deploy.sh + on: + repo: containous/traefik + tags: true + - provider: script + script: script/deploy-docker.sh + on: + repo: containous/traefik diff --git a/README.md b/README.md index a87f1b0e6..aba362b35 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![Twitter](https://img.shields.io/twitter/follow/traefikproxy.svg?style=social)](https://twitter.com/intent/follow?screen_name=traefikproxy) -Træfɪk is a modern HTTP reverse proxy and load balancer made to deploy microservices with ease. +Træfɪk (pronounced like [traffic](https://speak-ipa.bearbin.net/speak.cgi?speak=%CB%88tr%C3%A6f%C9%AAk)) is a modern HTTP reverse proxy and load balancer made to deploy microservices with ease. It supports several backends ([Docker](https://www.docker.com/), [Swarm](https://docs.docker.com/swarm), [Kubernetes](http://kubernetes.io), [Marathon](https://mesosphere.github.io/marathon/), [Mesos](https://github.com/apache/mesos), [Consul](https://www.consul.io/), [Etcd](https://coreos.com/etcd/), [Zookeeper](https://zookeeper.apache.org), [BoltDB](https://github.com/boltdb/bolt), [Eureka](https://github.com/Netflix/eureka), Rest API, file...) to manage its configuration automatically and dynamically. ## Overview diff --git a/build.Dockerfile b/build.Dockerfile index 78ea3f7ac..48f71254a 100644 --- a/build.Dockerfile +++ b/build.Dockerfile @@ -1,13 +1,21 @@ FROM golang:1.7 -RUN go get github.com/Masterminds/glide \ -&& go get github.com/jteeuwen/go-bindata/... \ +RUN go get github.com/jteeuwen/go-bindata/... \ && go get github.com/golang/lint/golint \ && go get github.com/kisielk/errcheck \ && go get github.com/client9/misspell/cmd/misspell # Which docker version to test on -ARG DOCKER_VERSION=1.10.1 +ARG DOCKER_VERSION=v0.10.3 + + +# Which glide version to test on +ARG GLIDE_VERSION=v0.12.3 + +# Download glide +RUN mkdir -p /usr/local/bin \ + && curl -SL https://github.com/Masterminds/glide/releases/download/${GLIDE_VERSION}/glide-${GLIDE_VERSION}-linux-amd64.tar.gz \ + | tar -xzC /usr/local/bin --transform 's#^.+/##x' # Download docker RUN mkdir -p /usr/local/bin \ diff --git a/webui/Dockerfile b/webui/Dockerfile index 413395fb3..5102a3969 100644 --- a/webui/Dockerfile +++ b/webui/Dockerfile @@ -3,12 +3,17 @@ FROM node:6.9.1 ENV WEBUI_DIR /src/webui RUN mkdir -p $WEBUI_DIR +RUN apt-get -yq update \ +&& apt-get -yq --no-install-suggests --no-install-recommends --force-yes install apt-transport-https \ +&& curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ +&& echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list \ +&& apt-get -yq update && apt-get -yq --no-install-suggests --no-install-recommends --force-yes install yarn + COPY package.json $WEBUI_DIR/ COPY yarn.lock $WEBUI_DIR/ WORKDIR $WEBUI_DIR RUN npm set progress=false -RUN npm install --quiet --global yarn@0.16.1 RUN yarn install COPY . $WEBUI_DIR/