From 1732a3cb9a97e2332b43dea6d017cd5cda902d8e Mon Sep 17 00:00:00 2001 From: didayolo Date: Thu, 13 Apr 2023 16:33:25 +0200 Subject: [PATCH] Change default docker image to py37 --- compute_worker/compute_worker.py | 2 +- src/apps/competitions/models.py | 2 +- src/apps/competitions/tests/unpacker_test_data.py | 2 +- src/apps/competitions/unpackers/v1.py | 2 +- src/apps/competitions/unpackers/v2.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/compute_worker/compute_worker.py b/compute_worker/compute_worker.py index 629d003b0..fb0d66b30 100644 --- a/compute_worker/compute_worker.py +++ b/compute_worker/compute_worker.py @@ -550,7 +550,7 @@ async def _run_program_directory(self, program_dir, kind, can_be_output=False): # Input from submission (or submission + ingestion combo) engine_cmd += ['-v', f'{self._get_host_path(self.input_dir)}:/app/input'] - # Set the image name (i.e. "codalab/codalab-legacy") for the container + # Set the image name (i.e. "codalab/codalab-legacy:py37") for the container engine_cmd += [self.container_image] # Handle Legacy competitions by replacing anything in the run command diff --git a/src/apps/competitions/models.py b/src/apps/competitions/models.py index dccb4e77f..9c5be88ef 100644 --- a/src/apps/competitions/models.py +++ b/src/apps/competitions/models.py @@ -42,7 +42,7 @@ class Competition(ChaHubSaveMixin, models.Model): terms = models.TextField(null=True, blank=True) is_migrating = models.BooleanField(default=False) description = models.TextField(null=True, blank=True) - docker_image = models.CharField(max_length=128, default="codalab/codalab-legacy:py3") + docker_image = models.CharField(max_length=128, default="codalab/codalab-legacy:py37") enable_detailed_results = models.BooleanField(default=False) queue = models.ForeignKey('queues.Queue', on_delete=models.SET_NULL, null=True, blank=True, diff --git a/src/apps/competitions/tests/unpacker_test_data.py b/src/apps/competitions/tests/unpacker_test_data.py index a061b86fc..5172e261b 100644 --- a/src/apps/competitions/tests/unpacker_test_data.py +++ b/src/apps/competitions/tests/unpacker_test_data.py @@ -6,7 +6,7 @@ "title": "Sample time series competition", "description": "Sample competition for time series prediction", "image": "logo.jpg", - "competition_docker_image": "codalab/codalab-legacy:py3", + "competition_docker_image": "codalab/codalab-legacy:py37", "end_date": None, "html": { "data": "data.txt", diff --git a/src/apps/competitions/unpackers/v1.py b/src/apps/competitions/unpackers/v1.py index 7ac01885b..897f6be02 100644 --- a/src/apps/competitions/unpackers/v1.py +++ b/src/apps/competitions/unpackers/v1.py @@ -11,7 +11,7 @@ def __init__(self, *args, **kwargs): # Just in case docker image is blank (""), replace with default value docker_image = self.competition_yaml.get('competition_docker_image') if not docker_image: - docker_image = "codalab/codalab-legacy:py3" + docker_image = "codalab/codalab-legacy:py37" self.competition = { "title": self.competition_yaml.get('title'), diff --git a/src/apps/competitions/unpackers/v2.py b/src/apps/competitions/unpackers/v2.py index 237441e69..f6bd941fb 100644 --- a/src/apps/competitions/unpackers/v2.py +++ b/src/apps/competitions/unpackers/v2.py @@ -13,7 +13,7 @@ def __init__(self, *args, **kwargs): "title": self.competition_yaml.get('title'), "logo": None, "registration_auto_approve": self.competition_yaml.get('registration_auto_approve', False), - "docker_image": self.competition_yaml.get('docker_image', 'codalab/codalab-legacy:py3'), + "docker_image": self.competition_yaml.get('docker_image', 'codalab/codalab-legacy:py37'), "enable_detailed_results": self.competition_yaml.get('enable_detailed_results', False), "description": self.competition_yaml.get("description", ""), "competition_type": self.competition_yaml.get("competition_type", "competition"),