From 378a689dd4452af4c13a5e67bb017e4a5831ba98 Mon Sep 17 00:00:00 2001 From: "Hiroki.T" Date: Mon, 15 Apr 2019 13:01:10 +0900 Subject: [PATCH] del: remove db container --- docker-compose.yml | 14 -------------- .../accounts_server/settings.py | 18 +++++++++--------- 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a94c54c..5ec2009 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,6 @@ version: '3.3' services: - db: - image: postgres - volumes: - - vpn4friends-account-db:/var/lib/postgresql/ - ports: - - 5432:5432 - openvpn_server: build: vpn_server volumes: @@ -18,8 +11,6 @@ services: - 80:8000 # WEB Front cap_add: - NET_ADMIN - depends_on: - - db environment: - CA_PASS=default - EMAIL_TLS=True @@ -27,8 +18,3 @@ services: - EMAIL_HOST_USER=user@example.com - EMAIL_HOST_PASSWORD=email_account_password - EMAIL_PORT=587 - - -volumes: - vpn4friends-account-db: - driver: local diff --git a/vpn_server/accounts_server/accounts_server/settings.py b/vpn_server/accounts_server/accounts_server/settings.py index 61885a9..efb7b29 100644 --- a/vpn_server/accounts_server/accounts_server/settings.py +++ b/vpn_server/accounts_server/accounts_server/settings.py @@ -75,15 +75,15 @@ # Database # https://docs.djangoproject.com/en/2.2/ref/settings/#databases -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'postgres', - 'USER': 'postgres', - 'HOST': 'db', - 'PORT': 5432, - } -} +# DATABASES = { +# 'default': { +# 'ENGINE': 'django.db.backends.postgresql', +# 'NAME': 'postgres', +# 'USER': 'postgres', +# 'HOST': 'db', +# 'PORT': 5432, +# } +# } # Password validation