Feature/docker

.env

@@ -0,0 +1,15 @@
+# Database config
+POSTGRES_DB=backend
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_PORT=5432
+POSTGRES_HOST=db
+
+# Django config
+DJANGO_SECRET_KEY=4y7c-7+bja2@e1$%d@6v+#dir%70!dc7!7_04e2r(d%4$g7+id
+DJANGO_HASHID_FIELD_SALT='9q#3t$5gs9ob682b@(6^fdv2kg*0ztr(3doa((w&kyq!d8rbt^'
+DJANGO_SETTINGS_MODULE=settings.configs
+DJANGO_ALLOWED_HOSTS=localhost
+DJANGO_DEBUG=False
+DJANGO_CONFIGURATION=Prod
+DJANGO_ADMIN_URL=admin

.env_example

@@ -0,0 +1,15 @@
+# Database config
+POSTGRES_DB=backend
+POSTGRES_USER=postgres
+POSTGRES_PASSWORD=postgres
+POSTGRES_PORT=5432
+POSTGRES_HOST=db
+
+# Django config
+DJANGO_SECRET_KEY=4y7c-7+bja2@e1$%d@6v+#dir%70!dc7!7_04e2r(d%4$g7+id
+DJANGO_HASHID_FIELD_SALT='9q#3t$5gs9ob682b@(6^fdv2kg*0ztr(3doa((w&kyq!d8rbt^'
+DJANGO_SETTINGS_MODULE=settings.configs
+DJANGO_ALLOWED_HOSTS=localhost
+DJANGO_DEBUG=False
+DJANGO_CONFIGURATION=Local
+DJANGO_ADMIN_URL=admin

.gitignore

@@ -1,5 +1,6 @@
+db.sqlite3
+.env
+.idea/
 __pycache__/
 *.py[cod]
-.idea/
-db.sqlite3
 .pytest_cache/

.travis.yml

@@ -1,7 +1,16 @@
+sudo: required
+services:
+  - docker
 language: python
 python:
   - "3.6"
-install:
-  - pip install -r requirements_test.txt
+before_install:
+  - docker-compose -v
+  - docker -v
 script:
-  - pytest
+  - docker-compose run --rm backend scripts/run_test.sh
+  - docker-compose run --rm backend python manage.py makemigrations --dry-run --check || { echo "ERROR Migration listed above have not been created"; exit 1; }
+notifications:
+  email:
+    on_success: change
+    on_failure: always

docker-compose.yml

@@ -0,0 +1,22 @@
+version: "3"
+
+services:
+  backend:
+    build:
+      context: .
+      dockerfile: src/Dockerfile
+      args:
+        - ENV_NAME=local
+    env_file:
+      - .env
+    depends_on:
+      - db
+    ports:
+      - "8000:8000"
+    command: scripts/run_local.sh
+    volumes:
+      - ./src:/app/backend
+  db:
+    image: postgres:10.3-alpine
+    env_file:
+      - .env

requirements/base.txt

@@ -0,0 +1,7 @@
+Django==2.0.2
+django-configurations==2.0
+django-hashid-field==2.1.0
+djangorestframework==3.7.7
+djangorestframework-jwt==1.11.0
+dj_database_url==0.5.0
+psycopg2==2.7.4

requirements/local.txt

@@ -0,0 +1,4 @@
+-r base.txt
+-r prod.txt
+-r qa.txt
+-r test.txt

requirements/prod.txt

@@ -0,0 +1,2 @@
+-r base.txt
+uwsgi==2.0.17

requirements/qa.txt

@@ -0,0 +1,2 @@
+-r base.txt
+uwsgi==2.0.17

requirements/test.txt

@@ -0,0 +1,8 @@
+-r base.txt
+factory-boy==2.10.0
+flake8==3.5.0
+pytest==3.4.1
+pytest-django==3.1.2
+pytest-env==0.6.2
+pytest-factoryboy==2.0.1
+pytest-sugar==0.9.1

src/Dockerfile

@@ -0,0 +1,23 @@
+FROM python:3.6-alpine
+
+ENV APP_DIR /app/backend
+
+RUN mkdir -p $APP_DIR
+WORKDIR $APP_DIR
+
+RUN apk update && \
+    apk add postgresql-libs && \
+    apk add --virtual .build-deps build-base gcc linux-headers make python3-dev musl-dev postgresql-dev
+
+# Available choices: base, prod, qa, test, local
+ARG ENV_NAME
+
+COPY requirements $APP_DIR/requirements
+RUN pip install --no-cache-dir -r requirements/${ENV_NAME}.txt && \
+    apk --purge del .build-deps
+
+COPY src $APP_DIR
+
+ENTRYPOINT ["sh", "/app/backend/scripts/entrypoint.sh"]
+
+EXPOSE 8000

manage.py → src/manage.py

@@ -3,9 +3,10 @@
 import sys
 
 if __name__ == "__main__":
-    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "restauth.settings")
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings.configs")
+    os.environ.setdefault('DJANGO_CONFIGURATION', 'Prod')
     try:
-        from django.core.management import execute_from_command_line
+        from configurations.management import execute_from_command_line
     except ImportError:
         # The above import may fail for some other reason. Ensure that the
         # issue is really that Django is missing to avoid masking other

src/pytest.ini

@@ -0,0 +1,5 @@
+[pytest]
+python_files = tests.py test_*.py *_tests.py
+env =
+    DJANGO_SETTINGS_MODULE = settings.configs
+    DJANGO_CONFIGURATION = Test

restauth/apps.py → src/restauth/apps.py

@@ -3,3 +3,4 @@
 
 class RestauthConfig(AppConfig):
     name = 'restauth'
+    verbose_name = 'Rest Auth'

src/restauth/migrations/0003_auto_20180304_1017.py

@@ -0,0 +1,24 @@
+# Generated by Django 2.0.2 on 2018-03-04 10:17
+
+from django.db import migrations, models
+import hashid_field.field
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('restauth', '0002_userprofile'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='user',
+            name='id',
+            field=hashid_field.field.HashidAutoField(alphabet='abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890', min_length=7, primary_key=True, serialize=False),
+        ),
+        migrations.AlterField(
+            model_name='user',
+            name='is_active',
+            field=models.BooleanField(default=True),
+        ),
+    ]