Skip to content

Commit

Permalink
feat: share images between backends (#708)
Browse files Browse the repository at this point in the history

Signed-off-by: SdgJlbl <[email protected]>
  • Loading branch information
SdgJlbl authored and guilhem-barthes committed Feb 12, 2024
1 parent ff089e8 commit f1f04a4
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 1 deletion.
1 change: 0 additions & 1 deletion backend/builder/image_builder/image_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ def _get_entrypoint_from_dockerfile(dockerfile_dir: str) -> list[str]:
raise BuildError("Invalid Dockerfile: Cannot find ENTRYPOINT")



def _delete_kaniko_pod(create_pod: bool, k8s_client: kubernetes.client.CoreV1Api, pod_name: str) -> str:
logs = ""
if create_pod:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Generated by Django 4.1.7 on 2023-08-10 08:43

from django.db import migrations
from django.db import models

import substrapp.models.compute_task_failure_report
import substrapp.storages.minio


class Migration(migrations.Migration):
dependencies = [
("substrapp", "0014_rename_algo_to_function"),
]

operations = [
migrations.AlterField(
model_name="computetaskfailurereport",
name="logs",
field=models.FileField(
max_length=36,
storage=substrapp.storages.minio.MinioStorage("substra-compute-task-logs"),
upload_to=substrapp.models.compute_task_failure_report._upload_to,
),
),
]
37 changes: 37 additions & 0 deletions backend/substrapp/migrations/0016_add_functionimage.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# Generated by Django 4.1.7 on 2023-08-11 11:30

import django.db.models.deletion
from django.db import migrations
from django.db import models

import substrapp.models.datamanager
import substrapp.models.function
import substrapp.storages.minio


class Migration(migrations.Migration):
dependencies = [
("substrapp", "0015_alter_computetaskfailurereport_logs"),
]

operations = [
migrations.CreateModel(
name="FunctionImage",
fields=[
("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
(
"file",
models.FileField(
max_length=500,
storage=substrapp.storages.minio.MinioStorage("substra-function"),
upload_to=substrapp.models.function.upload_to_function,
),
),
("checksum", models.CharField(blank=True, max_length=64)),
(
"function",
models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to="substrapp.function"),
),
],
),
]
1 change: 1 addition & 0 deletions backend/substrapp/serializers/function.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from libs.serializers import DynamicFieldsModelSerializer
from substrapp.models import Function
from substrapp.models import FunctionImage
from substrapp.serializers.utils import FileSizeValidator
from substrapp.serializers.utils import FileValidator

Expand Down

0 comments on commit f1f04a4

Please sign in to comment.