Merge pull request #287 from containous/fix-doc-deploy

Fix doc deploy...

docs/basics.md

@@ -63,7 +63,7 @@ Frontends can be defined using the following rules:
 - `HeadersRegexp: Content-Type, application/(text|json)`: Regular expressions can be used with headers as well. It accepts a sequence of key/value pairs, where the value has regex support.
 - `Host: traefik.io, www.traefik.io`: Match request host with given host list.
 - `HostRegexp: traefik.io, {subdomain:[a-z]+}.traefik.io`: Adds a matcher for the URL hosts. It accepts templates with zero or more URL variables enclosed by `{}`. Variables can define an optional regexp pattern to be matched.
-- `Method: GET, POST, PUT`: Methods adds a matcher for HTTP methods. It accepts a sequence of one or more methods to be matched.
+- `Method: GET, POST, PUT`: Method adds a matcher for HTTP methods. It accepts a sequence of one or more methods to be matched.
 - `Path: /products/, /articles/{category}/{id:[0-9]+}`: Path adds a matcher for the URL paths. It accepts templates with zero or more URL variables enclosed by `{}`.
 - `PathStrip`: Same as `Path` but strip the given prefix from the request URL's Path.
 - `PathPrefix`: PathPrefix adds a matcher for the URL path prefixes. This matches if the given template is a prefix of the full URL path.

script/deploy.sh

@@ -8,6 +8,9 @@ else
   exit 0
 fi
 
+git config --global user.email "emile@vauge.com"
+git config --global user.name "Emile Vauge"
+
 # load ssh key
 echo "Loading key..."
 openssl aes-256-cbc -d -k "$pass" -in .travis/traefik.id_rsa.enc -out ~/.ssh/traefik.id_rsa
@@ -28,19 +31,30 @@ ghr -t $GITHUB_TOKEN -u containous -r traefik --prerelease ${VERSION} dist/
 
 # update docs.traefik.io
 echo "Generating and updating documentation..."
-mkdocs gh-deploy --clean
+# mkdir site
+# cd site
+# git init
+# git remote add origin git@github.com:containous/traefik.git
+# git fetch origin
+# git checkout gh-pages
+# cd ..
+# mkdocs build --clean
+# cd site
+# git add .
+# echo $VERSION | git commit --file -
+# git push -q -f origin gh-pages > /dev/null 2>&1
+git remote add ssh git@github.com:containous/traefik.git
+mkdocs gh-deploy -c -r ssh
 
 # 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.name "Emile Vauge"
 git clone git@github.com:containous/traefik-library-image.git
 cd traefik-library-image
 ./update.sh $VERSION
 git add -A
 echo $VERSION | git commit --file -
 echo $VERSION | git tag -a $VERSION --file -
-git push -q --follow-tags -u origin master
+git push -q --follow-tags -u origin master > /dev/null 2>&1
 
 # create docker image emilevauge/traefik (compatibility)
 echo "Updating docker emilevauge/traefik image..."