Skip to content

Commit

Permalink
fix migrations and makefile
Browse files Browse the repository at this point in the history
  • Loading branch information
robinpdev committed May 19, 2024
1 parent bec848e commit c0cfec4
Show file tree
Hide file tree
Showing 5 changed files with 40 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ mockdata:
docker exec -it pigeonhole-backend python manage.py runscript mockdata

evaltest:
docker exec -it pigeonhole-backend python manage.py runscript eval_test
docker exec -it pigeonhole-backend python manage.py runscript eval_test

reset:
docker image prune -af
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 4.2.13 on 2024-05-19 11:35

import backend.pigeonhole.apps.projects.models
from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('projects', '0001_initial'),
]

operations = [
migrations.AddField(
model_name='project',
name='test_dockerfile',
field=models.FileField(blank=True, null=True, upload_to=backend.pigeonhole.apps.projects.models.get_upload_to),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 4.2.13 on 2024-05-19 11:35

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('submissions', '0005_submissions_eval_result'),
]

operations = [
migrations.AddField(
model_name='submissions',
name='eval_output',
field=models.TextField(null=True),
),
]
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ services:
command: python manage.py runserver 0.0.0.0:8000
volumes:
- ./backend/:/usr/src/app/backend/
- submissions:/usr/src/app/backend/uploads/submissions/
#- submissions:/usr/src/app/backend/uploads/submissions/
- /var/run/docker.sock:/var/run/docker.sock
- ${SUBMISSIONS_PATH}:/home/app/web/submissions
ports:
Expand Down
2 changes: 1 addition & 1 deletion frontend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# pull official base image
FROM cypress/base:20.11.0 AS deps
FROM cypress/base:latest AS deps

# set work directory
WORKDIR /usr/src/app
Expand Down

0 comments on commit c0cfec4

Please sign in to comment.