diff --git a/docker-compose.yaml b/docker-compose.yaml index 7f7e7e4b..165d4d37 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,14 +1,10 @@ -version: '2.0' +version: '3.8' services: - db: - image: postgres - koalixcrm: - build: . - environment: - - DJANGO_SETTINGS_MODULE=projectsettings.settings.docker_development_settings - - JAVA_HOME=/usr/bin/jdk1.8.0_181/jre + web: + image: ghcr.io/koalixswitzerland/koalixcrm-dev-container:main ports: - "8000:8000" - depends_on: - - db \ No newline at end of file + volumes: + - .:/usr/src/app + - ./data:/usr/src/app/data \ No newline at end of file diff --git a/entrypoint.prod.sh b/entrypoint.prod.sh deleted file mode 100644 index b4880754..00000000 --- a/entrypoint.prod.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -python manage.py migrate --settings=projectsettings.settings.docker_production_settings -python manage.py runserver 0.0.0.0:8000 --settings=projectsettings.settings.docker_production_settings \ No newline at end of file diff --git a/entrypoint.sh b/entrypoint.sh deleted file mode 100644 index fcc9d566..00000000 --- a/entrypoint.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -python manage.py migrate --settings=projectsettings.settings.docker_development_settings -python manage.py runserver 0.0.0.0:8000 --settings=projectsettings.settings.docker_development_settings \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 384d388c..57320cb1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ --r requirements/heroku_requirements.txt \ No newline at end of file +-r requirements/prod_requirements.txt \ No newline at end of file diff --git a/requirements/heroku_requirements.txt b/requirements/heroku_requirements.txt deleted file mode 100644 index 6338e1d2..00000000 --- a/requirements/heroku_requirements.txt +++ /dev/null @@ -1,5 +0,0 @@ --r base_requirements.txt --r test_requirements.txt - -gunicorn==19.7.1 -dj-database-url==0.4.2 diff --git a/requirements/base_requirements.txt b/requirements/prod_requirements.txt similarity index 100% rename from requirements/base_requirements.txt rename to requirements/prod_requirements.txt diff --git a/requirements/test_requirements.txt b/requirements/test_requirements.txt deleted file mode 100644 index f282f1a6..00000000 --- a/requirements/test_requirements.txt +++ /dev/null @@ -1,7 +0,0 @@ -pytest>=3.7.0 -pytest-cov>=2.5.1 -pytest-django>=3.1.2 -codacy-coverage>=1.3.6 -selenium>=3.14.0 -factory_boy>=2.11.1 -pylint>=2.1.1 \ No newline at end of file diff --git a/setup.py b/setup.py index 7ddf5094..f91475a3 100644 --- a/setup.py +++ b/setup.py @@ -10,24 +10,24 @@ author_email='aaron.riedener@gmail.com', license='BSD', packages=find_packages(exclude=["projectsettings", "documentation"]), - install_requires=['Django==3.0.7', - 'django-filebrowser==3.13.1', - 'lxml==4.4.2', + install_requires=['Django==3.2.20', + 'django-filebrowser==3.14.3', + 'lxml==5.1.0', 'olefile==0.46', 'Pillow==7.1.2', 'psycopg2-binary==2.8.4', - 'pytz==2019.3', - 'django-grappelli==2.14.2', - 'djangorestframework==3.11.0', - 'djangorestframework-xml==1.4.0', + 'pytz==2022.4', + 'django-grappelli==2.15.7', + 'djangorestframework==3.14.0', + 'djangorestframework-xml==2.0.0', 'markdown==3.1.1', - 'django-filter==2.2.0', - 'pandas==0.25.2', - 'matplotlib==3.2.1', + 'django-filter==23.5', + 'pandas==1.5.3', + 'matplotlib==3.7.5' ], zip_safe=False, classifiers=['Development Status :: 4 - Beta', - 'Programming Language :: Python :: 3.8', ], + 'Programming Language :: Python :: 3.10', ], python_requires='~=3.5', include_package_data=True, )