Merge branch 'feature/docker-build' into 'marietje-zuid'

Add Docker build and docker compose file

See merge request technicie/MarietjeDjango!78

marietje/marietje/settings/production.py

@@ -0,0 +1,49 @@
+import os
+
+from .base import *
+
+SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY")
+
+DEBUG = False
+
+ALLOWED_HOSTS = [os.environ.get("DJANGO_ALLOWED_HOST")]
+
+SESSION_COOKIE_SECURE = True
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.mysql',
+        'NAME': os.environ.get("DJANGO_MYSQL_NAME"),
+        'USER': os.environ.get("DJANGO_MYSQL_USER"),
+        'PASSWORD': os.environ.get("DJANGO_MYSQL_PASSWORD"),
+        'HOST': os.environ.get("DJANGO_MYSQL_HOST"),
+        'PORT': os.environ.get("DJANGO_MYSQL_PORT"),
+        'OPTIONS': {'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
+    }
+}
+
+# Logging
+# https://docs.djangoproject.com/en/3.2/topics/logging/
+
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "handlers": {
+        "file": {
+            "level": "INFO",
+            "class": "logging.FileHandler",
+            "filename": "/marietje/log/django.log",
+        },
+    },
+    "loggers": {
+        "": {
+            "handlers": ["file"],
+            "level": "DEBUG",
+            "propagate": True,
+        },  # noqa
+    },  # noqa
+}
+
+BASE_URL = 'https://marietje-zuid.science.ru.nl'
+
+BERTHA_HOST = (os.environ.get("DJANGO_BERTHA_HOST"), os.environ.get("DJANGO_BERTHA_PORT"))

marietje/marietje/settings/production.py.example

@@ -1,23 +0,0 @@
-from .base import *
-
-SECRET_KEY = '******'
-
-DEBUG = False
-
-ALLOWED_HOSTS = ['marietje-zuid.nl']
-
-DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.mysql',
-        'NAME': 'marietje',
-        'USER': 'marietje',
-        'PASSWORD': '******',
-        'HOST': 'localhost',
-        'PORT': '3306',
-        'OPTIONS': {'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
-    }
-}
-
-BASE_URL = 'https://marietje-zuid.science.ru.nl'
-
-BERTHA_HOST = ('bach.science.ru.nl', 1234)