diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b80f51af..117cf95c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,8 @@ variables: DOCKER_TLS_CERTDIR: "" DOCKER_HOST: "tcp://docker_service_host:2375" K8S_INGRESS_DOMAIN: "polemarch-$KUBE_NAMESPACE.$KUBE_INGRESS_BASE_DOMAIN" + LC_ALL: en_US.UTF-8 + LANG: en_US.UTF-8 stages: - code_standarts diff --git a/Dockerfile b/Dockerfile index c50dbc89..97c85e7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,6 +4,10 @@ WORKDIR /usr/local/project COPY . . +ENV WORKER=ENABLE + LC_ALL = en_US.UTF-8 + LANG = en_US.UTF-8 + RUN tox -c tox_build.ini -e py36-build && \ mv dist/ environment/docker_data/ @@ -12,6 +16,8 @@ RUN tox -c tox_build.ini -e py36-build && \ FROM alpine:3.11 ENV WORKER=ENABLE + LC_ALL = en_US.UTF-8 + LANG = en_US.UTF-8 COPY --from=build /usr/local/project/environment/docker_data/ /etc/polemarch/ diff --git a/polemarch/__init__.py b/polemarch/__init__.py index 08f26b08..acb1787d 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.8.3" +__version__ = "1.8.4" prepare_environment(**default_settings) diff --git a/tox.ini b/tox.ini index b86a372f..fad3eab9 100644 --- a/tox.ini +++ b/tox.ini @@ -10,6 +10,8 @@ whitelist_externals = setenv = CCACHE_DIR = {envdir}/.ccache COMPILE_WITH_TESTS = true + LC_ALL = en_US.UTF-8 + LANG = en_US.UTF-8 passenv = DJANGO_LOG_LEVEL CC @@ -66,6 +68,9 @@ commands = [testenv:build] basepython = python3.6 +setenv = + LC_ALL = en_US.UTF-8 + LANG = en_US.UTF-8 passenv = * changedir = . whitelist_externals = @@ -78,6 +83,9 @@ commands = [testenv:builddoc] basepython = python3.6 changedir = ./doc/ +setenv = + LC_ALL = en_US.UTF-8 + LANG = en_US.UTF-8 whitelist_externals = cp make @@ -92,6 +100,9 @@ deps = basepython = python3.6 toxworkdir = ./ passenv = * +setenv = + LC_ALL = en_US.UTF-8 + LANG = en_US.UTF-8 whitelist_externals = mkdir ls @@ -107,7 +118,10 @@ basepython = python3.6 skipsdist = False usedevelop = True envdir = {toxinidir}/env -setenv = CCACHE_DIR = {envdir}/.ccache +setenv = + CCACHE_DIR = {envdir}/.ccache + LC_ALL = en_US.UTF-8 + LANG = en_US.UTF-8 passenv = * whitelist_externals = * commands = @@ -120,6 +134,9 @@ deps = [testenv:deploy_env] passenv = * +setenv = + LC_ALL = en_US.UTF-8 + LANG = en_US.UTF-8 whitelist_externals = /bin/sh commands = @@ -133,6 +150,9 @@ deps = [testenv:destroy_env] passenv = * +setenv = + LC_ALL = en_US.UTF-8 + LANG = en_US.UTF-8 whitelist_externals = /bin/sh commands = @@ -146,6 +166,9 @@ deps = [testenv:release-docker] passenv = * +setenv = + LC_ALL = en_US.UTF-8 + LANG = en_US.UTF-8 commands = ansible-playbook docker_release.yml -v -i ./environment/docker_build_image_inventory.ini --connection local deps = ansible==2.5 diff --git a/tox_build.ini b/tox_build.ini index dcdd93f4..3d7d300a 100644 --- a/tox_build.ini +++ b/tox_build.ini @@ -22,7 +22,7 @@ deps = cython>=0.29,<1.0 wheel==0.31.1 setuptools>=40.6.3 - jsmin==2.2.2 + jsmin==3.0.0 csscompressor==0.9.5 {rpm,deb}: virtualenv==16.0 {rpm,deb}: venvctrl