From 121cc0a212775112fa5e0c211b0047f367a40186 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Bedna=C5=99=C3=ADk?= <jan.bednarik@gmail.com>
Date: Mon, 24 May 2021 14:44:36 +0200
Subject: [PATCH] Dockerfile for deployment
---
Dockerfile | 7 ++++---
run.sh => run_server.sh | 0
run_worker.sh | 7 +++++++
settings.py | 8 +++++++-
4 files changed, 18 insertions(+), 4 deletions(-)
rename run.sh => run_server.sh (100%)
create mode 100644 run_worker.sh
diff --git a/Dockerfile b/Dockerfile
index 5bcfa7b..1d19e95 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2.7.18-buster
+FROM python:3.6
RUN mkdir /app
WORKDIR /app
@@ -10,9 +10,10 @@ COPY . .
RUN bash -c 'adduser --disabled-login --quiet --gecos app app && \
chmod -R o+r /app/ && \
- chmod o+x /app/run.sh'
+ chmod o+x /app/run_server.sh && \
+ chmod o+x /app/run_worker.sh'
USER app
EXPOSE 8000
-CMD ["bash", "run.sh"]
+CMD ["bash", "run_server.sh"]
diff --git a/run.sh b/run_server.sh
similarity index 100%
rename from run.sh
rename to run_server.sh
diff --git a/run_worker.sh b/run_worker.sh
new file mode 100644
index 0000000..393ce5f
--- /dev/null
+++ b/run_worker.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# exit on error
+set -e
+
+# start celeryd
+exec celery worker --app helios --events --beat --concurrency 1
diff --git a/settings.py b/settings.py
index ce9b02e..e925e47 100644
--- a/settings.py
+++ b/settings.py
@@ -14,7 +14,7 @@ def get_from_env(var, default):
else:
return default
-DEBUG = (get_from_env('DEBUG', '1') == '1')
+DEBUG = (get_from_env('DEBUG', '0') == '1')
# add admins of the form:
# ('Ben Adida', 'ben@adida.net'),
@@ -287,3 +287,9 @@ if ROLLBAR_ACCESS_TOKEN:
PIRATI_REALM_URL = get_from_env('PIRATI_REALM_URL', '')
PIRATI_CLIENT_ID = get_from_env('PIRATI_CLIENT_ID', '')
PIRATI_CLIENT_SECRET = get_from_env('PIRATI_CLIENT_SECRET', '')
+
+# override defaults
+DEFAULT_FROM_EMAIL = "helios@pirati.cz"
+DEFAULT_FROM_NAME = "Pirati - Helios Voting"
+WELCOME_MESSAGE = "Vítejte na hlasovacím systému České pirátské strany"
+SITE_TITLE = "Hlasovací systém Helios | Česká piratská strana"
--
GitLab