Merge pull request #422 from containous/fix-travis-tag

Fix travis tag check
Fix travis hangs on docker version
2016-05-31 00:15:58 +02:00 · 2016-05-30 23:59:27 +02:00 · 2016-05-30 23:44:53 +02:00 · 2016-05-30 18:27:48 +02:00 · 2016-05-30 17:57:57 +02:00 · 2016-05-30 17:48:50 +02:00
3 changed files with 6 additions and 7 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,9 @@
 branches:
-  except:
-  - /^v\d\.\d\.\d.*$/
 env:
  global:
    - secure: btt4r13t09gQlHb6gYrvGC2yGCMMHfnp1Mz1RQedc4Mpf/FfT8aE6xmK2a2i9CCvskjrP0t/BFaS4yxIURjnFRn+ugQIEa0pLspB9UJArW/vgOSpIWM9/OQ/fg8z5XuMxN6Md4DL1/iLypMNSageA1x0TRdt89+D1N1dALpg5XRCXLFbC84TLi0gjlFuib9ibPKzEhLT+anCRJ6iZMzeupDSoaCVbAtJMoDvXw4+4AcRZ1+k4MybBLyCib5boaEOt4pTT88mz4Kk0YaMwPVJyg9Qv36VqyUcPS09Yd95LuyVQ4+tZt8Y1ccbIzULsK+sLM3hLCzxlmlpN3dQBlZJiiRtQde0mgGAKyC0P0A1XjuDTywcsa5edB+fTk1Dsewz9xZ9V0NmMz8t+UNZnaSsAPga9i86jULbXUUwMVSzVRc+Xgx02liB/8qI1xYC9FM6ilStt7rn7mF0k3KbiWhcptgeXjO6Lah9FjEKd5w4MXsdUSTi/86rQaLo+kj+XdaTrXCTulKHyRyQEUj+8V1w0oVz7pcGjePHd7y5oU9ByifVQy6sytuFBfRZvugM5bKHo+i0pcWvixrZS42DrzwxZJsspANOvqSe5ifVbvOkfUppQdCBIwptxV5N1b49XPKU3W/w34QJ8xGmKp3TFA7WwVCztriFHjPgiRpB3EG99Bg=
    - REPO: $TRAVIS_REPO_SLUG
-    - VERSION: v1.0.0-beta.$TRAVIS_BUILD_NUMBER
+    - VERSION: $TRAVIS_TAG
  matrix:
    - DOCKER_VERSION=1.9.1
    - DOCKER_VERSION=1.10.1
@@ -17,6 +15,7 @@ install:
 - sudo curl https://get.docker.com/builds/Linux/x86_64/docker-${DOCKER_VERSION} -o /usr/bin/docker
 - sudo chmod +x /usr/bin/docker
 - sudo service docker start
+- sleep 5
 - docker version
 - pip install --user mkdocs
 - pip install --user pymdown-extensions
--- a/script/deploy.sh
+++ b/script/deploy.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e

-if ([ "$TRAVIS_BRANCH" = "master" ] || [ ! -z "$TRAVIS_TAG" ]) && [ "$TRAVIS_PULL_REQUEST" = "false" ] && [ "$DOCKER_VERSION" = "1.10.1" ]; then
+if [ -n "$TRAVIS_TAG" ] && [ "$DOCKER_VERSION" = "1.10.1" ]; then
  echo "Deploying..."
 else
  echo "Skipping deploy"
--- a/traefik.go
+++ b/traefik.go
@@ -101,9 +101,6 @@ func run(traefikConfiguration *TraefikConfiguration) {
 	}
 	log.SetLevel(level)

-	if len(traefikConfiguration.ConfigFile) != 0 {
-		log.Infof("Using TOML configuration file %s", traefikConfiguration.ConfigFile)
-	}
 	if traefikConfiguration.File != nil && len(traefikConfiguration.File.Filename) == 0 {
 		// no filename, setting to global config file
 		if len(traefikConfiguration.ConfigFile) != 0 {
@@ -136,6 +133,9 @@ func run(traefikConfiguration *TraefikConfiguration) {
 	}
 	jsonConf, _ := json.Marshal(globalConfiguration)
 	log.Infof("Traefik version %s built on %s", Version, BuildDate)
+	if len(traefikConfiguration.ConfigFile) != 0 {
+		log.Infof("Using TOML configuration file %s", traefikConfiguration.ConfigFile)
+	}
 	log.Debugf("Global configuration loaded %s", string(jsonConf))
 	server := NewServer(globalConfiguration)
 	server.Start()
Author	SHA1	Message	Date
Emile Vauge	a9f9894f29	Merge pull request #422 from containous/fix-travis-tag Fix travis tag check	2016-05-31 00:15:58 +02:00
Emile Vauge	a6c360eeda	Fix travis hangs on docker version Signed-off-by: Emile Vauge <emile@vauge.com>	2016-05-30 23:59:27 +02:00
Emile Vauge	01a4002169	Fix travis tag check Signed-off-by: Emile Vauge <emile@vauge.com>	2016-05-30 23:44:53 +02:00
Emile Vauge	8caaf317ae	Merge pull request #412 from containous/prepare-release-candidate Prepare release candidate	2016-05-30 18:27:48 +02:00
Emile Vauge	0e3c2ef10f	Fix log config file Signed-off-by: Emile Vauge <emile@vauge.com>	2016-05-30 17:57:57 +02:00
Emile Vauge	db6c85d3d7	Prepare release candidate Signed-off-by: Emile Vauge <emile@vauge.com>	2016-05-30 17:48:50 +02:00