diff --git a/portainer-compose.yml b/portainer-compose.yml index 059c179..bdf6b47 100644 --- a/portainer-compose.yml +++ b/portainer-compose.yml @@ -1,16 +1,37 @@ version: '3' - +volumes: + data: services: backend: - image: pwebtcgr5/backend:datasrc + image: pwebtcgr5/backend:postgres networks: - caddy deploy: labels: - caddy.address: http://shareameal.ribes.ovh + caddy.address: http://api.shareameal.ribes.ovh caddy.tls: "off" caddy.proxy.transparent: caddy.targetport: "8000" + environment: + DATABASE_URL: 'postgres://shareameal:hjklhjkl@database:5432/prod' + frontend: + image: pwebtcgr5/frontend + networks: + - caddy + deploy: + labels: + caddy.address: http://shareameal.ribes.ovh + caddy.tls: "off" + caddy.proxy.transparent: + caddy.targetport: "80" + database: + image: library/postgres:11-alpine + environment: + POSTGRES_USER: "shareameal" + POSTGRES_PASSWORD: "hjklhjkl" + POSTGRES_DB: "prod" + volumes: + - data:/var/lib/postgresql/data networks: caddy: external: diff --git a/requirements.txt b/requirements.txt index 772d9b6..1a71f2b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,17 @@ asgiref==3.2.3 +bson==0.5.8 +dataclasses==0.7 +dj-database-url==0.5.0 Django==3.0.3 django-cors-headers==3.2.1 django-filter==2.2.0 +django-rest-framework-mongoengine==3.4.1 djangorestframework==3.11.0 +djongo==1.3.1 +mongoengine==0.19.1 +psycopg2==2.8.5 +pymongo==3.10.1 +python-dateutil==2.8.1 pytz==2019.3 +six==1.14.0 sqlparse==0.3.0 diff --git a/shareameal/settings.py b/shareameal/settings.py index 2bc4a1b..cebbba6 100644 --- a/shareameal/settings.py +++ b/shareameal/settings.py @@ -13,6 +13,8 @@ import os # Build paths inside the project like this: os.path.join(BASE_DIR, ...) +import dj_database_url + BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Quick-start development settings - unsuitable for production @@ -82,10 +84,8 @@ # https://docs.djangoproject.com/en/3.0/ref/settings/#databases DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - } + 'default': dj_database_url.config(default='sqlite:///' + os.path.join(BASE_DIR, 'db.sqlite3'), conn_max_age=600) + #'default': dj_database_url.config(default='postgres://shareameal:hjklhjkl@vps.ribes.ovh:5432/dev'), conn_max_age=600) } # Password validation