diff --git a/Dockerfile b/Dockerfile index 7cc4783..7f42448 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM python:3.6 -RUN apt-get -y update && apt-get -y upgrade && apt-get install git && apt-get install curl COPY ./ /access_controller WORKDIR /access_controller/ RUN pip install -r requirements.txt +RUN python manage.py makemigrations EXPOSE 8000 COPY start.sh /var/ CMD bash /var/start.sh diff --git a/access_controller/settings.py b/access_controller/settings.py index deadf32..80b4ac0 100644 --- a/access_controller/settings.py +++ b/access_controller/settings.py @@ -86,7 +86,7 @@ WSGI_APPLICATION = 'access_controller.wsgi.application' DATABASES = { 'default': { 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', + 'NAME': os.path.join(BASE_DIR / 'db'/ 'db.sqlite3'), } } diff --git a/main/migrations/0013_rolechangelogs_test.py b/main/migrations/0013_rolechangelogs_test.py new file mode 100644 index 0000000..983ae29 --- /dev/null +++ b/main/migrations/0013_rolechangelogs_test.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-03-22 13:43 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0012_auto_20210312_1225'), + ] + + operations = [ + migrations.AddField( + model_name='rolechangelogs', + name='test', + field=models.IntegerField(default=0, help_text='test'), + ), + ] diff --git a/main/migrations/0014_remove_rolechangelogs_test.py b/main/migrations/0014_remove_rolechangelogs_test.py new file mode 100644 index 0000000..c5a5dad --- /dev/null +++ b/main/migrations/0014_remove_rolechangelogs_test.py @@ -0,0 +1,17 @@ +# Generated by Django 3.1.6 on 2021-03-22 13:44 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('main', '0013_rolechangelogs_test'), + ] + + operations = [ + migrations.RemoveField( + model_name='rolechangelogs', + name='test', + ), + ] diff --git a/main/models.py b/main/models.py index 112e29e..039ba06 100644 --- a/main/models.py +++ b/main/models.py @@ -40,3 +40,4 @@ class RoleChangeLogs(models.Model): change_time = models.DateTimeField(help_text='Дата и время изменения роли') changed_by = models.ForeignKey(to=User, on_delete=models.CASCADE, related_name='changed_by', help_text='Кем была изменена роль') + diff --git a/start.sh b/start.sh index 1d78a75..d4f4106 100644 --- a/start.sh +++ b/start.sh @@ -1,6 +1,9 @@ cd /access_controller/ -python manage.py migrate +if [ ! -f "/access_controller/db/db.sqlite3" ]; then + python manage.py migrate +fi + python manage.py collectstatic --noinput python manage.py runserver 0.0.0.0:8000