diff --git a/.env-local b/.env-local index 8e7460c3..aaec6cc1 100644 --- a/.env-local +++ b/.env-local @@ -1,5 +1,6 @@ -DATABASE_URL=postgres://postgres:password@database_default:5432/db +DATABASE_URL=mysql://cms:password@database_default:3306/db DEFAULT_STORAGE_DSN=file:///data/media/?url=%2Fmedia%2F DEBUG=True DOMAIN_ALIASES="localhost, 127.0.0.1" SECURE_SSL_REDIRECT=False +DB_PORT=3307 \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 0445706c..a485113a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.11 +FROM python:3.8.13 WORKDIR /app diff --git a/backend/settings.py b/backend/settings.py index 648a8763..912cd965 100644 --- a/backend/settings.py +++ b/backend/settings.py @@ -50,13 +50,6 @@ 'filer', 'easy_thumbnails', - # the default publishing implementation - optional, but used in most projects - 'djangocms_versioning', - - # the default alias content - optional, but used in most projects - 'djangocms_alias', - 'parler', - # the default CKEditor - optional, but used in most projects 'djangocms_text_ckeditor', diff --git a/compose.yaml b/compose.yaml index 83e7d009..422d4760 100644 --- a/compose.yaml +++ b/compose.yaml @@ -21,23 +21,23 @@ services: database_default: # Select one of the following db configurations for the database - image: postgres:15-alpine + image: mysql:8.0.34 ports: - - "${DB_PORT-}:5432/tcp" # allow your local dev env to connect to the db if variable set + - "${DB_PORT-}:3306/tcp" # allow your local dev env to connect to the db if variable set environment: - POSTGRES_DB: "db" - POSTGRES_PASSWORD: "password" - POSTGRES_HOST_AUTH_METHOD: "trust" - SERVICE_MANAGER: "fsm-postgres" + MYSQL_DATABASE: "db" + MYSQL_USER: "cms" + MYSQL_PASSWORD: "password" + MYSQL_RANDOM_ROOT_PASSWORD: "yes" networks: - djangocmsnet volumes: - - postgres-data:/var/lib/postgresql/data/ + - mysql:/var/lib/mysql networks: djangocmsnet: volumes: - postgres-data: \ No newline at end of file + mysql: \ No newline at end of file diff --git a/requirements.in b/requirements.in index 80573f33..552dad01 100644 --- a/requirements.in +++ b/requirements.in @@ -2,6 +2,7 @@ # pip-compile -U --resolver=backtracking boto3 +mysqlclient psycopg2 uwsgi @@ -12,9 +13,7 @@ whitenoise easy-thumbnails # key requirements for django CMS -django-cms>=4.1.0 -djangocms-versioning>=2.0.0 -djangocms-alias>=2.0.0 +django-cms==3.11.4 # optional, but used in most projects djangocms-admin-style>=3.2.2 diff --git a/requirements.txt b/requirements.txt index 8c9a4e81..cfd7825e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,13 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.8 # by the following command: # -# pip-compile --output-file=requirements.txt requirements.in +# pip-compile # asgiref==3.7.2 # via django +backports-zoneinfo==0.2.1 + # via django boto3==1.34.11 # via -r requirements.in botocore==1.34.11 @@ -32,7 +34,6 @@ django==4.2.8 # django-entangled # django-filer # django-formtools - # django-parler # django-polymorphic # django-sekizai # django-select2 @@ -40,9 +41,7 @@ django==4.2.8 # django-storages # django-treebeard # djangocms-admin-style - # djangocms-alias # djangocms-frontend - # djangocms-versioning # easy-thumbnails django-appconf==1.0.6 # via django-select2 @@ -50,14 +49,12 @@ django-classy-tags==4.1.0 # via # django-cms # django-sekizai -django-cms==4.1.0 +django-cms==3.11.4 # via # -r requirements.in - # djangocms-alias # djangocms-attributes-field # djangocms-frontend # djangocms-text-ckeditor - # djangocms-versioning django-entangled==0.5.4 # via djangocms-frontend django-filer==3.1.1 @@ -66,10 +63,6 @@ django-filer==3.1.1 # djangocms-frontend django-formtools==2.5.1 # via django-cms -django-fsm==2.8.1 - # via djangocms-versioning -django-parler==2.3 - # via djangocms-alias django-polymorphic==3.1.0 # via django-filer django-sekizai==4.1.0 @@ -86,8 +79,6 @@ djangocms-admin-style==3.2.6 # via # -r requirements.in # django-cms -djangocms-alias==2.0.0 - # via -r requirements.in djangocms-attributes-field==3.0.0 # via djangocms-frontend djangocms-frontend==1.2.2 @@ -96,8 +87,6 @@ djangocms-text-ckeditor==5.1.5 # via # -r requirements.in # djangocms-frontend -djangocms-versioning==2.0.0 - # via -r requirements.in easy-thumbnails[svg]==2.8.5 # via # -r requirements.in @@ -107,12 +96,16 @@ furl==2.1.3 # via django-storage-url html5lib==1.1 # via djangocms-text-ckeditor +importlib-metadata==7.0.1 + # via build jmespath==1.0.1 # via # boto3 # botocore lxml==5.0.0 # via svglib +mysqlclient==2.2.1 + # via -r requirements.in orderedmultidict==1.0.1 # via furl packaging==23.2 @@ -153,9 +146,16 @@ tinycss2==1.2.1 # via # cssselect2 # svglib +tomli==2.0.1 + # via + # build + # pip-tools + # pyproject-hooks typing-extensions==4.9.0 - # via dj-database-url -urllib3==2.0.7 + # via + # asgiref + # dj-database-url +urllib3==1.26.18 # via botocore uwsgi==2.0.23 # via -r requirements.in @@ -168,6 +168,8 @@ wheel==0.42.0 # via pip-tools whitenoise==6.6.0 # via -r requirements.in +zipp==3.17.0 + # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: # pip