diff --git a/.gitignore b/.gitignore index 7d81e2ddbe63c2adf51470bf0cac80cd239f99c4..1bdf9c43b2d82f3b90a8b838fb63a0fd038f75f2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,8 +3,11 @@ __pycache__/ .env .idea/ -# For settings configuration +# Backend +## For settings backend/metagenedb/settings/__init__.py +## Static files +backend/static # Jupyter notebook notebooks/ diff --git a/backend/metagenedb/apps/catalog/migrations/0001_initial.py b/backend/metagenedb/apps/catalog/migrations/0001_initial.py index 2a2bc33247f3f3f6dff221cf1b7b809e4bbc79db..bb17ec5277c9623867a3da2e71689fbeb3c45fec 100644 --- a/backend/metagenedb/apps/catalog/migrations/0001_initial.py +++ b/backend/metagenedb/apps/catalog/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 2.2.1 on 2019-06-17 14:38 +# Generated by Django 2.2.1 on 2019-06-18 09:45 from django.db import migrations, models import django.db.models.deletion diff --git a/backend/metagenedb/apps/catalog/models/gene.py b/backend/metagenedb/apps/catalog/models/gene.py index adabb55e3e6c3549c139aec567315db02dbeb4d4..15dbdf5d05555ce5a9633c790a7de20c9ececcdd 100644 --- a/backend/metagenedb/apps/catalog/models/gene.py +++ b/backend/metagenedb/apps/catalog/models/gene.py @@ -6,7 +6,7 @@ from .function import Function class Gene(models.Model): gene_id = models.CharField(max_length=100, unique=True, db_index=True) gene_length = models.IntegerField() - functions = models.ManyToManyField(Function, null=True) + functions = models.ManyToManyField(Function) def __str__(self): return self.gene_id diff --git a/backend/metagenedb/settings/base.py b/backend/metagenedb/settings/base.py index c68f6d54b5439152a458c071693af1ef5ae73277..f47874e4e2d52c5d1b63e8c5fea682ac44ffd72b 100644 --- a/backend/metagenedb/settings/base.py +++ b/backend/metagenedb/settings/base.py @@ -139,3 +139,4 @@ USE_TZ = True # https://docs.djangoproject.com/en/2.2/howto/static-files/ STATIC_URL = '/static/' +STATIC_ROOT = 'static' diff --git a/backend/scripts/start.sh b/backend/scripts/start.sh new file mode 100755 index 0000000000000000000000000000000000000000..8760074dd8e714e4b57288dd1fced4f98e1ba81c --- /dev/null +++ b/backend/scripts/start.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +SCRIPTS_PATH=scripts + +python ${SCRIPTS_PATH}/manage.py collectstatic --no-input +# python ${SCRIPTS_PATH}/manage.py makemigrations +python ${SCRIPTS_PATH}/manage.py migrate +python ${SCRIPTS_PATH}/manage.py runserver 0.0.0.0:8000 diff --git a/docker-compose.yaml b/docker-compose.yaml index cc9160e0f1fdec977c5723c9f3b99bd7ad18d46d..019fd4c561433e91eba2bfbf8224ed6bb18320d2 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -2,6 +2,7 @@ version: '3.7' services: backend: + container_name: backend build: ./backend volumes: - ./backend:/code @@ -12,9 +13,10 @@ services: DEBUG: "true" depends_on: - db - command: python /code/scripts/manage.py runserver 0.0.0.0:8000 + command: /code/scripts/start.sh db: + container_name: db image: postgres:latest ports: - "5433:5432"