Compare commits

...

2 Commits

Author SHA1 Message Date
Roberto Rosario
f0ae0d06c7 Switch to 2 Redis databases
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
2019-07-02 21:40:12 -04:00
Roberto Rosario
924778d42f Update Docker image to use Python3
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
2019-07-02 21:36:18 -04:00
2 changed files with 7 additions and 6 deletions

View File

@@ -57,8 +57,9 @@ apt-get update \
&& echo "maxmemory-policy allkeys-lru" >> /etc/redis/redis.conf \ && echo "maxmemory-policy allkeys-lru" >> /etc/redis/redis.conf \
# Disable saving the Redis database # Disable saving the Redis database
echo "save \"\"" >> /etc/redis/redis.conf \ echo "save \"\"" >> /etc/redis/redis.conf \
# Only provision 1 database # Only provision 2 database. One for the broker and the other for
&& echo "databases 1" >> /etc/redis/redis.conf # results
&& echo "databases 2" >> /etc/redis/redis.conf
#### ####
@@ -96,14 +97,14 @@ apt-get install -y --no-install-recommends \
libssl-dev \ libssl-dev \
g++ \ g++ \
gcc \ gcc \
python-dev \ python3-dev \
python-virtualenv \ python3-virtualenv \
&& mkdir -p "${PROJECT_INSTALL_DIR}" \ && mkdir -p "${PROJECT_INSTALL_DIR}" \
&& chown -R mayan:mayan "${PROJECT_INSTALL_DIR}" \ && chown -R mayan:mayan "${PROJECT_INSTALL_DIR}" \
&& chown -R mayan:mayan /src && chown -R mayan:mayan /src
USER mayan USER mayan
RUN python -m virtualenv "${PROJECT_INSTALL_DIR}" \ RUN python3 -m virtualenv -p /usr/bin/python3 "${PROJECT_INSTALL_DIR}" \
&& . "${PROJECT_INSTALL_DIR}/bin/activate" \ && . "${PROJECT_INSTALL_DIR}/bin/activate" \
&& pip install --no-cache-dir --no-use-pep517 \ && pip install --no-cache-dir --no-use-pep517 \
librabbitmq==1.6.1 \ librabbitmq==1.6.1 \

View File

@@ -108,7 +108,7 @@ class PlatformTemplate(object):
class PlatformTemplateSupervisord(PlatformTemplate): class PlatformTemplateSupervisord(PlatformTemplate):
context_defaults = { context_defaults = {
'BROKER_URL': 'redis://127.0.0.1:6379/0', 'BROKER_URL': 'redis://127.0.0.1:6379/0',
'CELERY_RESULT_BACKEND': 'redis://127.0.0.1:6379/0', 'CELERY_RESULT_BACKEND': 'redis://127.0.0.1:6379/1',
} }
label = _('Template for Supervisord.') label = _('Template for Supervisord.')
name = 'supervisord' name = 'supervisord'