Skip to content

Commit

Permalink
1.8.4
Browse files Browse the repository at this point in the history
#### Changelog:
* Fix: build docker build.
* Fix: ansible with latest pip does not work on LANG=C.
* Fix: jsmin==3.0.0
  • Loading branch information
onegreyonewhite committed Sep 30, 2021
1 parent 236f18c commit 26516b8
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 3 deletions.
2 changes: 2 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/

Expand All @@ -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/

Expand Down
2 changes: 1 addition & 1 deletion polemarch/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
25 changes: 24 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 =
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 =
Expand All @@ -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 =
Expand All @@ -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 =
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tox_build.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 26516b8

Please sign in to comment.