diff --git a/.gitignore b/.gitignore index f5e96db..8071609 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ -venv \ No newline at end of file +.idea +venv +__pycache__ +db.sqlite3 diff --git a/CryptoCurrencyRestAPI/settings.py b/CryptoCurrencyRestAPI/settings.py index ee3dc7d..cbd32d0 100644 --- a/CryptoCurrencyRestAPI/settings.py +++ b/CryptoCurrencyRestAPI/settings.py @@ -20,7 +20,7 @@ # See https://docs.djangoproject.com/en/2.0/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'nydy(tk6kg8lq+y9vf!@$qvmwlb*21tlp5)2pwf5kc1dyn1zbd' +SECRET_KEY = '5=0gcw=t^vjrr%i1$!ffv0i=cn)r&!oza%x+@yb39z9gnr&js@' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True @@ -75,8 +75,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/Dockerfile b/Dockerfile new file mode 100644 index 0000000..b45a393 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM python:3 +ENV PYTHONUNBUFFERED 1 +RUN mkdir /code +WORKDIR /code +ADD requirements.txt /code/ +RUN pip install -r requirements.txt +ADD . /code/ diff --git a/README.md b/README.md index 7cb6c84..b145d21 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,31 @@ # CryptoCurrencyRestAPI +## docker-compose + +https://docs.docker.com/compose/django/#connect-the-database + +create project + +``` +docker-compose run web django-admin.py startproject CryptoCurrencyRestAPI . +``` + +change owner and group + +``` +sudo chown $USER:$USER -R . +``` + +run docker-compose + +``` +docker-compose up +``` + +and navigate to 127.0.0.1:8000 + +## deployment + Running on DigitalOcean droplet, adress: http://206.189.12.80/ ## How was this Django project deployed? diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..deed22f --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,18 @@ +version: '3' + +services: + db: + image: postgres:10.3 + ports: + - 5432:5432 + volumes: + - ./pgdata:/var/lib/postgresql/data/ + web: + build: . + command: python3 manage.py runserver 0.0.0.0:8000 + volumes: + - .:/code + ports: + - 8000:8000 + depends_on: + - db diff --git a/manage.py b/manage.py old mode 100644 new mode 100755 diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..4bec01f --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +Django==2.0.4 +psycopg2