From f3e11c32fc7caa125e9a47e438f6c9d13ecc2c04 Mon Sep 17 00:00:00 2001 From: didayolo Date: Wed, 16 Nov 2022 13:38:15 +0100 Subject: [PATCH 1/3] add condition --- docker/compute_worker/compute_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/compute_worker/compute_worker.py b/docker/compute_worker/compute_worker.py index 8f13a5a85..110010ad3 100644 --- a/docker/compute_worker/compute_worker.py +++ b/docker/compute_worker/compute_worker.py @@ -484,7 +484,7 @@ async def _run_program_directory(self, program_dir, kind, can_be_output=False): with open(os.path.join(program_dir, metadata_path), 'r') as metadata_file: metadata = yaml.load(metadata_file.read(), Loader=yaml.FullLoader) logger.info(f"Metadata contains:\n {metadata}") - command = metadata.get("command") + command = metadata.get("command") if metadata is not None else None # in case the file exists but is empty if not command and kind == "ingestion": raise SubmissionException("Program directory missing 'command' in metadata") elif not command: From f0fd6bc014fd7ee5ce004da189c67df665feea6a Mon Sep 17 00:00:00 2001 From: didayolo Date: Wed, 16 Nov 2022 13:59:44 +0100 Subject: [PATCH 2/3] Update GPU Dockerfile --- Dockerfile.compute_worker_gpu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.compute_worker_gpu b/Dockerfile.compute_worker_gpu index a8d9038d8..02db69afd 100644 --- a/Dockerfile.compute_worker_gpu +++ b/Dockerfile.compute_worker_gpu @@ -6,8 +6,8 @@ RUN apt-get update && apt-get install curl wget -y # This makes output not buffer and return immediately, nice for seeing results in stdout ENV PYTHONUNBUFFERED 1 -# Install a specific version of docker -RUN curl -sSL https://get.docker.com/ | sed 's/docker-ce/docker-ce=18.03.0~ce-0~debian/' | sh +# Install Docker +RUN apt-get update && curl -fsSL https://get.docker.com | sh # nvidia-docker jazz RUN curl -s -L https://nvidia.github.io/nvidia-docker/gpgkey | apt-key add - From ad6d93725c45d2fe57484fde474009ca0e317f28 Mon Sep 17 00:00:00 2001 From: didayolo Date: Wed, 16 Nov 2022 16:51:50 +0100 Subject: [PATCH 3/3] Make Dockerfiles more robust (amd64 arch) --- Dockerfile.compute_worker | 2 +- Dockerfile.compute_worker_gpu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile.compute_worker b/Dockerfile.compute_worker index 8934fb37b..77e0ef69d 100644 --- a/Dockerfile.compute_worker +++ b/Dockerfile.compute_worker @@ -1,4 +1,4 @@ -FROM python:3.8 +FROM --platform=linux/amd64 python:3.8 # This makes output not buffer and return immediately, nice for seeing results in stdout ENV PYTHONUNBUFFERED 1 diff --git a/Dockerfile.compute_worker_gpu b/Dockerfile.compute_worker_gpu index 02db69afd..f2110647c 100644 --- a/Dockerfile.compute_worker_gpu +++ b/Dockerfile.compute_worker_gpu @@ -1,4 +1,4 @@ -FROM python:3.8.1-buster +FROM --platform=linux/amd64 python:3.8.1-buster # We need curl to get docker/nvidia-docker RUN apt-get update && apt-get install curl wget -y