feat: änderungen für deployment zu heroku

specify python version for heroku update gunicorn conf for heroku feat: add release file to do all the stuff fix: webpack for heroku feat: statisfiles via whitenoise for heroku fix: downgrade elasticsearch to make it work with more clients see: https://stackoverflow.com/questions/68762774/elasticsearchunsupportedproducterror-the-client-noticed-that-the-server-is-no
digifarm-ms · Aug 3, 2023 · da40cfa · da40cfa
1 parent 5116764
commit da40cfa
Show file tree

Hide file tree

Showing 8 changed files with 124 additions and 149 deletions.
diff --git a/Procfile b/Procfile
@@ -1,2 +1,2 @@
 web: gunicorn --config etc/gunicorn.conf.py meine_stadt_transparent.wsgi:application
-release: ./manage.py migrate --no-input
+release: ./etc/release.sh
diff --git a/etc/gunicorn.conf.py b/etc/gunicorn.conf.py
@@ -1,6 +1,9 @@
+import os
+
 # The settings can be overwritten by mounting a differnt file into the docker container
 access_logfile = "-"
-bind = ":8000"
+port = os.getenv('PORT', '8000')
+bind = f"0.0.0.0:{port}"
 capture_output = True
 log_file = "-"
 timeout = 60

diff --git a/etc/release.sh b/etc/release.sh
@@ -0,0 +1,2 @@
+python ./manage.py compilemessages -l de -l en
+python ./manage.py migrate --no-input
diff --git a/meine_stadt_transparent/settings/__init__.py b/meine_stadt_transparent/settings/__init__.py
@@ -164,7 +164,7 @@
 # https://docs.djangoproject.com/en/1.11/howto/static-files/
 
 STATIC_URL = "/static/"
-STATIC_ROOT = env.str("STATIC_ROOT", os.path.join(BASE_DIR, "static/"))
+STATIC_ROOT = env.str("STATIC_ROOT", os.path.join(BASE_DIR, "staticfiles/"))
 
 STATICFILES_DIRS = (
     os.path.join(BASE_DIR, "mainapp/assets"),

diff --git a/meine_stadt_transparent/settings/nested.py b/meine_stadt_transparent/settings/nested.py
@@ -39,6 +39,7 @@
 
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
+    "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "mainapp.functions.inject_accept_language.inject_accept_language",
     "django.middleware.common.CommonMiddleware",

diff --git a/package.json b/package.json
@@ -11,7 +11,8 @@
     "build:prod": "NODE_ENV=production webpack --config ./etc/webpack.config.prod.js",
     "build:email": "mjml mainapp/assets/email/user-alert.mjml -o mainapp/templates/email/user-alert.html",
     "watch": "NODE_ENV=dev webpack --config etc/webpack.config.dev.js --watch",
-    "watch:email": "mjml -w mainapp/assets/email/user-alert.mjml -o mainapp/templates/email/user-alert.html"
+    "watch:email": "mjml -w mainapp/assets/email/user-alert.mjml -o mainapp/templates/email/user-alert.html",
+    "heroku-postbuild": "./node_modules/.bin/webpack --config ./etc/webpack.config.prod.js"
   },
   "author": "Konstantin Schütze, Tobias Hößl",
   "license": "MIT",

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -15,7 +15,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = "^3.8"
+python = "3.9.17"
 Django = ">=4.1.1,<4.2.0"
 PyPDF2 = { version = "^3.0.0", extras = ["crypto"] }
 Wand = "^0.6.0"
@@ -32,7 +32,7 @@ django-simple-history = "^3.0"
 django-webpack-loader = "1.8.0"
 django-widget-tweaks = "^1.4"
 django_csp = "^3.4"
-elasticsearch = "7.17.9"
+elasticsearch = "<7.14.0"
 elasticsearch-dsl = "^7.3"
 geoextract = "^0.3.1"
 geopy = "^2.0.0"
@@ -52,6 +52,7 @@ sentry-sdk = "^1.0.0"
 splinter = "~0.19"
 tqdm = "^4.29"
 wagtail = "~4.2.1"
+whitenoise = "~6.5.0"
 
 [tool.poetry.dev-dependencies]
 black = { version = "^23.3.0", extras = ["d"] }