From 4b5c16ed2a445eded429d79fb73fe6946b2d339a Mon Sep 17 00:00:00 2001
From: Sergey Klyuykov <onegreyonewhite@mail.ru>
Date: Thu, 19 Dec 2019 12:02:35 +1000
Subject: [PATCH] Fix publish building

---
 .gitlab-ci.yml        | 29 ++++++++++++++++-------------
 doc/installation.rst  | 34 ++++++++++++++++++++++------------
 polemarch/__init__.py |  2 +-
 3 files changed, 39 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 725550aa..f5651903 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -50,19 +50,19 @@ stages:
       - merge_requests
       - web
       - master
-    changes:
-      - polemarch/main/**/*
-      - polemarch/api/**/*
-      - polemarch/__init__.py
-      - tests.py
-      - setup.{py,cfg}
-      - MANIFEST.in
-      - requirements.txt
-      - requirements-test.txt
-      - Makefile
-      - tox.ini
-      - .coveragerc
-      - .gitlab-ci.yml
+#    changes:
+#      - polemarch/main/**/*
+#      - polemarch/api/**/*
+#      - polemarch/__init__.py
+#      - tests.py
+#      - setup.{py,cfg}
+#      - MANIFEST.in
+#      - requirements.txt
+#      - requirements-test.txt
+#      - Makefile
+#      - tox.ini
+#      - .coveragerc
+#      - .gitlab-ci.yml
   retry: 2
 
 # Branch tests
@@ -195,6 +195,9 @@ release_pypi:
 publish_docker:
   stage: publish
   image: python:2-slim-jessie
+  services:
+    - name: 'docker:19.03-dind'
+      alias: 'docker_service_host'
   script:
     - pip install tox
     - tox -e release-docker
diff --git a/doc/installation.rst b/doc/installation.rst
index 57aa6b18..6a5abf69 100644
--- a/doc/installation.rst
+++ b/doc/installation.rst
@@ -184,11 +184,12 @@ If you need to stop Polemarch use following command:
 If you use another directory for storing Polemarch pid file, use path to this file.
 
 
-Install from PyPI
------------------
+Install from docker
+-------------------
 
 
-## Run image
+Run image
+~~~~~~~~~
 
 For run Polemarch docker image use command:
 
@@ -201,9 +202,11 @@ Using this command download official docker image and run it with default settin
 Polemarch will be run with web interface on port `8080`
 
 
-## Settings
+Settings
+~~~~~~~~
 
-### Main section
+Main section
+~~~~~~~~~~~~
 
 * **POLEMARCH_DEBUG** - status of debug mode. Default value: `false`.
 
@@ -211,7 +214,8 @@ Polemarch will be run with web interface on port `8080`
 
 * **TIMEZONE** - timezone. Default value: `UTC`.
 
-### Database section
+Database section
+~~~~~~~~~~~~~~~~
 
 If you not set **POLEMARCH_DB_HOST**, default database would be SQLite3, path to database file: `/db.sqlite3`. If you set **POLEMARCH_DB_HOST**, Polemarch would be use MYSQL with next variabls:
 
@@ -227,15 +231,18 @@ If you not set **POLEMARCH_DB_HOST**, default database would be SQLite3, path to
 
 * **POLEMARCH_DB_PORT** - port for connection to database.
 
-### Database.Options section
+Database.Options section
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 * **DB_INIT_CMD** - command to start your database
 
-### Cache
+Cache
+~~~~~
 
 * **CACHE_LOCATION** - path to cache, if you use `/tmp/polemarch_django_cache` path, then cache engine would be `FileBasedCache`, else `MemcacheCache`. Default value: ``/tmp/polemarch_django_cache`
 
-### RPC section
+RPC section
+~~~~~~~~~~~
 
 * **RPC_ENGINE** - connection to rpc service. If not set, not used.
 
@@ -244,15 +251,18 @@ If you not set **POLEMARCH_DB_HOST**, default database would be SQLite3, path to
 * **RPC_CONCURRENCY** - Number of
 concurrently tasks. Default value: `4`.
 
-### Web section
+Web section
+~~~~~~~~~~~
 
 * **POLEMARCH_WEB_REST_PAGE_LIMIT** - Limit elements in answer, when send REST request. Default value: `1000`.
 
-### UWSGI section
+UWSGI section
+~~~~~~~~~~~~~
 
 * **POLEMARCH_UWSGI_PROCESSES** - number of uwsgi processes. Default value: `4`.
 
-### Other settings:
+Other settings
+~~~~~~~~~~~~~~
 
 If you set `WORKER` to `ENABLE` state, uwsgi run worker as daemon.
 
diff --git a/polemarch/__init__.py b/polemarch/__init__.py
index 6c45a2cd..eff03c9e 100644
--- a/polemarch/__init__.py
+++ b/polemarch/__init__.py
@@ -31,6 +31,6 @@
     "VST_ROOT_URLCONF": os.getenv("VST_ROOT_URLCONF", 'vstutils.urls'),
 }
 
-__version__ = "1.6.1"
+__version__ = "1.6.1.post1"
 
 prepare_environment(**default_settings)