Skip to content

Commit 5e541c0

Browse files
The base image is changed, up version alpine
Changelog: * added restart a container at error (docker-compose). * changed base docker image to alpine 3.11. * Fix error while loading frontend. Closes vstconsulting/polemarch#104 See merge request polemarch/ce!196
2 parents b6c4be7 + e6731b1 commit 5e541c0

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM onegreyonewhite/tox:python AS build
1+
FROM vstconsulting/images:tox AS build
22

33
WORKDIR /usr/local/project
44

@@ -9,7 +9,7 @@ RUN tox -c tox_build.ini -e py36-build && \
99

1010
###############################################################
1111

12-
FROM alpine:3.10
12+
FROM alpine:3.11
1313

1414
ENV WORKER=ENABLE
1515

@@ -21,7 +21,7 @@ RUN cat /etc/polemarch/system_requirements.txt | xargs apk --update add && \
2121
/opt/polemarch/bin/pip3 install -U pip wheel setuptools && \
2222
/opt/polemarch/bin/pip3 install -U -r /etc/polemarch/system_requirements_pip.txt && \
2323
mkdir -p /projects /hooks && \
24-
/opt/polemarch/bin/pip3 install -U /etc/polemarch/dist/$(ls /etc/polemarch/dist/ | grep "\.tar\.gz" | tail -1)[mysql,postgresql,uwsgi] && \
24+
/opt/polemarch/bin/pip3 install -U /etc/polemarch/dist/$(ls /etc/polemarch/dist/ | grep "\.tar\.gz" | tail -1)[mysql,postgresql] && \
2525
mkdir -p /run/openldap && \
2626
apk --purge del .build-deps && \
2727
rm -rf ~/.cache/pip/* && \

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ version: '3'
22
services:
33
polemarch:
44
build: .
5+
restart: unless-stopped
56
environment:
67
POLEMARCH_DB_TYPE: mysql
78
POLEMARCH_DB_NAME: project-db

polemarch/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@
3131
"VST_ROOT_URLCONF": os.getenv("VST_ROOT_URLCONF", 'vstutils.urls'),
3232
}
3333

34-
__version__ = "1.7.5"
34+
__version__ = "1.7.6"
3535

3636
prepare_environment(**default_settings)

0 commit comments

Comments
 (0)