Skip to content

Commit

Permalink
Use genialis alias in image names
Browse files Browse the repository at this point in the history
  • Loading branch information
gregorjerse committed Dec 6, 2024
1 parent 5fa2ed9 commit a43e668
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions resolwe/flow/executors/docker/run.py
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,14 @@ async def start(self):
"image",
SETTINGS.get(
"FLOW_DOCKER_DEFAULT_PROCESSING_CONTAINER_IMAGE",
"public.ecr.aws/s4q6j6e8/resolwe/base:ubuntu-20.04",
"public.ecr.aws/genialis/resolwe/base:ubuntu-20.04",
),
)
)
communicator_image = self._map_docker_image(
SETTINGS.get(
"FLOW_DOCKER_COMMUNICATOR_IMAGE",
"public.ecr.aws/s4q6j6e8/resolwe/com:latest",
"public.ecr.aws/genialis/resolwe/com:latest",
)
)
ulimits = []
Expand Down
2 changes: 1 addition & 1 deletion resolwe/flow/management/commands/list_docker_images.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def handle(self, *args, **options):
getattr(
settings,
"FLOW_DOCKER_DEFAULT_PROCESSING_CONTAINER_IMAGE",
"public.ecr.aws/s4q6j6e8/resolwe/base:ubuntu-20.04",
"public.ecr.aws/genialis/resolwe/base:ubuntu-20.04",
)
)

Expand Down
4 changes: 2 additions & 2 deletions resolwe/flow/managers/workload_connectors/kubernetes.py
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ def start(self, data: Data, listener_connection: Tuple[str, str, str]):
communicator_image = getattr(
settings,
"FLOW_DOCKER_COMMUNICATOR_IMAGE",
"public.ecr.aws/s4q6j6e8/resolwe/com:latest",
"public.ecr.aws/genialis/resolwe/com:latest",
)
communicator_image = self._image_mapper(communicator_image, mapper)

Expand All @@ -763,7 +763,7 @@ def start(self, data: Data, listener_connection: Tuple[str, str, str]):
getattr(
settings,
"FLOW_DOCKER_DEFAULT_PROCESSING_CONTAINER_IMAGE",
"public.ecr.aws/s4q6j6e8/resolwe/base:ubuntu-20.04",
"public.ecr.aws/genialis/resolwe/base:ubuntu-20.04",
),
),
)
Expand Down
2 changes: 1 addition & 1 deletion resolwe/flow/tests/processes/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@
requirements:
executor:
docker:
image: public.ecr.aws/s4q6j6e8/resolwe/test:requirements-docker
image: public.ecr.aws/genialis/resolwe/test:requirements-docker
output:
- name: result
label: Result
Expand Down
2 changes: 1 addition & 1 deletion resolwe/process/descriptor.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def to_schema(self):
"requirements": {
"executor": {
"docker": {
"image": "public.ecr.aws/s4q6j6e8/resolwe/base:ubuntu-18.04",
"image": "public.ecr.aws/genialis/resolwe/base:ubuntu-18.04",
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion resolwe/process/tests/processes/python_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class PythonProcess(Process):
"expression-engine": "jinja",
"executor": {
"docker": {
"image": "public.ecr.aws/s4q6j6e8/resolwe/base:ubuntu-20.04",
"image": "public.ecr.aws/genialis/resolwe/base:ubuntu-20.04",
}
},
}
Expand Down
4 changes: 2 additions & 2 deletions resolwe/process/tests/test_python_process.py
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ def test_registration(self):
"expression-engine": "jinja",
"executor": {
"docker": {
"image": "public.ecr.aws/s4q6j6e8/resolwe/base:ubuntu-20.04"
"image": "public.ecr.aws/genialis/resolwe/base:ubuntu-20.04"
}
},
},
Expand Down Expand Up @@ -228,7 +228,7 @@ def test_python_process(self):
self.assertEqual(data.output["input_entity_name"], "Data with entity")
self.assertEqual(
data.output["docker_image"],
"public.ecr.aws/s4q6j6e8/resolwe/base:ubuntu-20.04",
"public.ecr.aws/genialis/resolwe/base:ubuntu-20.04",
)
self.assertEqual(data.name, "Foo: bar")

Expand Down
2 changes: 1 addition & 1 deletion resolwe/toolkit/processes/files.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class UploadFile(Process):
"expression-engine": "jinja",
"executor": {
"docker": {
"image": "public.ecr.aws/s4q6j6e8/resolwe/base:ubuntu-20.04-03022021",
"image": "public.ecr.aws/genialis/resolwe/base:ubuntu-20.04-03022021",
},
},
"resources": {
Expand Down
4 changes: 2 additions & 2 deletions tests/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,10 +255,10 @@

FLOW_DOCKER_AUTOREMOVE = False
FLOW_DOCKER_COMMUNICATOR_IMAGE = os.environ.get(
"RESOLWE_COMMUNICATOR_IMAGE", "public.ecr.aws/s4q6j6e8/resolwe/com:latest"
"RESOLWE_COMMUNICATOR_IMAGE", "public.ecr.aws/genialis/resolwe/com:latest"
)
FLOW_DOCKER_DEFAULT_PROCESSING_CONTAINER_IMAGE = (
"public.ecr.aws/s4q6j6e8/resolwe/base:ubuntu-20.04"
"public.ecr.aws/genialis/resolwe/base:ubuntu-20.04"
)

REST_FRAMEWORK = {
Expand Down

0 comments on commit a43e668

Please sign in to comment.