move to psql

Melevir · Melevir · commit 273e8162d1c1 · 2017-07-27T00:40:59.000+03:00
diff --git a/Dockerfile b/Dockerfile
@@ -5,3 +5,4 @@ WORKDIR /src
 ADD requirements.txt /src/
 RUN pip3 install -r /src/requirements.txt
 ADD . /src/
+CMD ["python3", "/src/manage.py", "migrate"]
diff --git a/README.rst b/README.rst
@@ -22,3 +22,11 @@ Contributing
     $ python manage.py createsuperuser --username admin --email=team@python.ru
 
 
+How to run from Docker:
+
+::
+
+    $ docker-compose build --no-cache
+    $ docker-compose run web python3 /src/manage.py migrate
+    $ docker-compose run web python3 /src/manage.py make_fish_data
+    $ docker-compose up
diff --git a/python_ru/settings.py b/python_ru/settings.py
@@ -54,8 +54,11 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.postgresql',
+        'NAME': 'postgres',
+        'USER': 'postgres',
+        'HOST': 'db',
+        'PORT': 5432,
     }
 }
 
diff --git a/requirements.txt b/requirements.txt
@@ -5,3 +5,5 @@ ipython==6.1.0
 factory-boy==2.7.0
 django-ckeditor==5.3.0
 Pillow==4.0.0
+psycopg2==2.6.2
+Faker==0.7.7

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,11 @@`
`54`	`54`
`55`	`55`	`DATABASES = {`
`56`	`56`	`'default': {`
`57`		`- 'ENGINE': 'django.db.backends.sqlite3',`
`58`		`- 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),`
	`57`	`+ 'ENGINE': 'django.db.backends.postgresql',`
	`58`	`+ 'NAME': 'postgres',`
	`59`	`+ 'USER': 'postgres',`
	`60`	`+ 'HOST': 'db',`
	`61`	`+ 'PORT': 5432,`
`59`	`62`	`}`
`60`	`63`	`}`
`61`	`64`