Merge pull request #355 from KoalixSwitzerland/#327-dockerfile-is-not…

…-correctly-configured

#327 dockerfile is not correctly configured

koalixcrm/version.py

@@ -1,3 +1 @@
-# -*- coding: utf-8 -*-
-
-KOALIXCRM_VERSION = "1.13.0"
+KOALIXCRM_VERSION = "1.14.0"

projectsettings/dashboard.py

@@ -8,7 +8,6 @@
 
 from django.utils.translation import gettext_lazy as _
 from grappelli.dashboard import modules, Dashboard
-from grappelli.dashboard.utils import get_admin_site_name
 from koalixcrm.version import KOALIXCRM_VERSION
 
 
@@ -19,7 +18,7 @@ class CustomIndexDashboard(Dashboard):
 
     def init_with_context(self, context):
         self.children.append(modules.Group(
-            _('koalixcrm Version' + KOALIXCRM_VERSION),
+            _('koalixcrm Version ' + KOALIXCRM_VERSION),
             column=1,
             collapsible=True,
             children=[

projectsettings/settings/base_settings.py

@@ -94,15 +94,15 @@
 STATIC_ROOT = os.path.join(BASE_DIR, 'static')
 
 MEDIA_URL = "/media/"
-MEDIA_ROOT = os.path.join(BASE_DIR)
+MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
 PROJECT_ROOT = BASE_DIR
 
 # Settings specific for koalixcrm
 PDF_OUTPUT_ROOT = os.path.join(STATIC_ROOT, 'pdf')
 
 # Settings specific for filebrowser
-FILEBROWSER_DIRECTORY = 'media/uploads/'
+FILEBROWSER_DIRECTORY = 'uploads/'
 FILEBROWSER_EXTENSIONS = {
     'XML': ['.xml'],
     'XSL': ['.xsl'],

projectsettings/wsgi.py

@@ -1,16 +1,19 @@
 """
-WSGI config for test_koalixcrm project.
+WSGI config for koalixcrm project.
 
-It exposes the WSGI callable as a module-level variable named ``application``.
+This module contains the WSGI application used by Django's development server
+and any production WSGI deployments. It should expose a module-level variable
+named `application`. Django's `runserver` and `runfcgi` commands discover
+this application via the `WSGI_APPLICATION` setting.
 
-For more information on this file, see
-https://docs.djangoproject.com/en/1.11/howto/deployment/wsgi/
+Usually this will be called "koalixcrm.wsgi".
 """
 
 import os
-
 from django.core.wsgi import get_wsgi_application
 
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "test_koalixcrm.settings")
+# The settings module that Django uses. By convention, it is usually in the form "myproject.settings.production"
+os.environ.setdefault("DJANGO_SETTINGS_MODULE",
+                      "koalixcrm.projectsettings.settings.production_docker_postgres_settings")
 
-application = get_wsgi_application()
+application = get_wsgi_application()

requirements.txt

@@ -1 +1 @@
--r requirements/prod_requirements.txt
+-r requirements/development_requirements.txt

requirements/development_requirements.txt

@@ -1,9 +1,9 @@
-Django==3.2.20
+Django==3.2.25
 django-filebrowser==3.14.3
 lxml==5.1.0
 olefile==0.46
-Pillow==7.1.2
-psycopg2-binary==2.8.4
+Pillow==10.3.0
+psycopg2-binary==2.9.9
 pytz==2022.4
 django-grappelli==2.15.7
 djangorestframework==3.14.0

setup.py

@@ -19,8 +19,8 @@
                         'django-filebrowser==3.14.3',
                         'lxml==5.1.0',
                         'olefile==0.46',
-                        "Pillow==10.2.0",
-                        'psycopg2-binary==2.8.4',
+                        "Pillow==10.3.0",
+                        'psycopg2-binary==2.9.9',
                         'pytz==2022.4',
                         'django-grappelli==2.15.7',
                         'djangorestframework==3.14.0',