Merge branch 'release/0.17.0'

.travis.yml

@@ -9,15 +9,28 @@ before_install:
   - docker --version
   - docker pull alpine:latest
 
-script:
-  # Build Image
-  - docker build -t polinux/mkdocs .
 
-  #
-  # Test daemon mode (default settings)
-  #
-  - docker run -d --cap-add NET_ADMIN -p 8000:8000 --name mkdocs polinux/mkdocs && sleep 10
-
-  # Test direct request to Nginx
-  - curl -sSLi http://mkdocs:8000  | grep '200 OK'
-
+jobs:
+  include:
+    - stage: build
+      script:
+        - docker build -t polinux/mkdocs:travis .
+        - docker login -u $DOCKER_USER -p $DOCKER_PASS
+        - docker push polinux/mkdocs:travis
+
+    - stage: test
+      script:
+        - docker login -u $DOCKER_USER -p $DOCKER_PASS
+        - docker run -d --cap-add NET_ADMIN -p 8000:8000 --name mkdocs polinux/mkdocs:travis
+        - sleep 10
+        - curl -sSLi http://mkdocs:8000  | grep '200 OK'
+
+    - name: deploy
+      if: branch = master
+      script:
+        - docker login -u $DOCKER_USER -p $DOCKER_PASS
+        - docker pull polinux/mkdocs:travis
+        - docker tag polinux/mkdocs:travis polinux/mkdocs:latest
+        - docker tag polinux/mkdocs:travis polinux/mkdocs:$TRAVIS_TAG
+        - docker push polinux/mkdocs:$TRAVIS_TAG
+        - docker push polinux/mkdocs:latest

Dockerfile

@@ -1,6 +1,6 @@
 FROM alpine:latest
 
-ENV MKDOCS_VERSIO="0.16.3"
+ENV MKDOCS_VERSION="0.17.0"
 
 RUN \
     apk add --update \
@@ -10,7 +10,7 @@ RUN \
         python2-dev \
         py-setuptools && \
     easy_install-2.7 pip && \
-    pip install mkdocs==${MKDOCS_VERSIO} && \
+    pip install mkdocs==${MKDOCS_VERSION} && \
     rm -rf /tmp/* /var/tmp/* /var/cache/apk/* /var/cache/distfiles/*
 
 COPY container-files /

README.md

@@ -4,12 +4,15 @@
 [![GitHub Open Issues](https://img.shields.io/github/issues/pozgo/docker-mkdocs.svg)](https://github.com/pozgo/docker-mkdocs/issues)
 [![GitHub Stars](https://img.shields.io/github/stars/pozgo/docker-mkdocs.svg)](https://github.com/pozgo/docker-mkdocs)
 [![GitHub Forks](https://img.shields.io/github/forks/pozgo/docker-mkdocs.svg)](https://github.com/pozgo/docker-mkdocs)  
-[![Stars on Docker Hub](https://img.shields.io/docker/stars/polinux/mkdocs.svg)](https://hub.docker.com/r/polinux/mkdocs)
-[![Pulls on Docker Hub](https://img.shields.io/docker/pulls/polinux/mkdocs.svg)](https://hub.docker.com/r/polinux/mkdocs)  
 [![](https://images.microbadger.com/badges/version/polinux/mkdocs.svg)](http://microbadger.com/images/polinux/mkdocs)
-[![](https://images.microbadger.com/badges/license/polinux/mkdocs.svg)](http://microbadger.com/images/polinux/mkdocs)
 [![](https://images.microbadger.com/badges/image/polinux/mkdocs.svg)](http://microbadger.com/images/polinux/mkdocs)
 
+[![Docker build](http://dockeri.co/image/polinux/mkdocs)](https://hub.docker.com/r/polinux/mkdocs/)
+
+
+Felling like supporting me in my projects use donate button. Thank You!  
+[![](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://www.paypal.me/POzgo)
+
 [Docker Image](https://registry.hub.docker.com/u/polinux/mkdocs/) with [MkDocs](http://www.mkdocs.org/). It's using tiny image provided by Alpine.  
 MkDocs is a fast, simple and downright gorgeous static site generator that's geared towards building project documentation. Documentation source files are written in Markdown, and configured with a single YAML configuration file.