From b752ff8a75ac7f18fab2ec0433602b8976eefcaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20K=C3=BCnzel?= <simonk@fsmpi.rwth-aachen.de>
Date: Sat, 17 May 2025 18:28:28 +0200
Subject: [PATCH] Update job controller docker config
---
.../config/job_controller_example_config.py | 5 +++--
job_controller/config/local_docker_image_tag.txt | 2 +-
.../executor_api/local_docker_executor.py | 15 ++++++---------
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/job_controller/config/job_controller_example_config.py b/job_controller/config/job_controller_example_config.py
index 0945a28..5883ec0 100644
--- a/job_controller/config/job_controller_example_config.py
+++ b/job_controller/config/job_controller_example_config.py
@@ -42,8 +42,9 @@ LOCAL_DOCKER_LOG_BUILD = False
# LOCAL_DOCKER_USE_PRE_BUILT_IMAGES = True
# LOCAL_DOCKER_PRE_BUILT_IMAGE_PATH_START = "registry.git.fsmpi.rwth-aachen.de/videoag/backend/production_job_"
# LOCAL_DOCKER_PRE_BUILT_IMAGE_TAG_FILE = "../config/local_docker_image_tag.txt"
-# LOCAL_DOCKER_MEDIA_DIRECTORY = "../../../live_media/"
-# LOCAL_DOCKER_JOB_CONTAINER_NETWORK = "host"
+LOCAL_DOCKER_MEDIA_DIRECTORY = "../../.media/"
+LOCAL_DOCKER_JOB_CONFIG_FILE = "../config/common_job_example_config.py"
+LOCAL_DOCKER_JOB_CONTAINER_NETWORK = "backend_videoag_backend"
K8S_NAMESPACE = "videoag-prod"
K8S_JOB_LABEL = "videoag-job"
diff --git a/job_controller/config/local_docker_image_tag.txt b/job_controller/config/local_docker_image_tag.txt
index 7082988..090fdc0 100644
--- a/job_controller/config/local_docker_image_tag.txt
+++ b/job_controller/config/local_docker_image_tag.txt
@@ -1 +1 @@
-v2.0.18
\ No newline at end of file
+v2.0.24
\ No newline at end of file
diff --git a/job_controller/src/job_controller/executor_api/local_docker_executor.py b/job_controller/src/job_controller/executor_api/local_docker_executor.py
index 10fe5c7..1ee2886 100644
--- a/job_controller/src/job_controller/executor_api/local_docker_executor.py
+++ b/job_controller/src/job_controller/executor_api/local_docker_executor.py
@@ -20,18 +20,15 @@ _PROJECT_ROOT_DIR = Path("../..").resolve()
LOG_BUILD = job_controller.config["LOCAL_DOCKER_LOG_BUILD"]
-_MEDIA_DIRECTORY = job_controller.config.get("LOCAL_DOCKER_MEDIA_DIRECTORY")
-if _MEDIA_DIRECTORY:
- _MEDIA_DIRECTORY_PATH = Path(_MEDIA_DIRECTORY).resolve()
-else:
- _MEDIA_DIRECTORY_PATH = _PROJECT_ROOT_DIR.joinpath(".media")
+_MEDIA_DIRECTORY = Path(job_controller.config["LOCAL_DOCKER_MEDIA_DIRECTORY"]).resolve()
+_JOB_CONFIG_FILE = Path(job_controller.config["LOCAL_DOCKER_JOB_CONFIG_FILE"]).resolve()
USE_PRE_BUILT_IMAGES = job_controller.config.get("LOCAL_DOCKER_USE_PRE_BUILT_IMAGES", False)
if USE_PRE_BUILT_IMAGES:
PRE_BUILT_IMAGE_PATH_START = job_controller.config["LOCAL_DOCKER_PRE_BUILT_IMAGE_PATH_START"]
PRE_BUILT_IMAGE_TAG_FILE = job_controller.config.get("LOCAL_DOCKER_PRE_BUILT_IMAGE_TAG_FILE")
-JOB_CONTAINER_NETWORK = job_controller.config.get("LOCAL_DOCKER_JOB_CONTAINER_NETWORK", "backend_videoag_backend")
+JOB_CONTAINER_NETWORK = job_controller.config["LOCAL_DOCKER_JOB_CONTAINER_NETWORK"]
class DockerJob(JobExecutionInfo):
@@ -104,14 +101,14 @@ class DockerJob(JobExecutionInfo):
_run_args.extend([
"-e", "VIDEOAG_CONFIG=/code/config/common_job_config.py",
"--mount",
- f"type=bind,source={_PROJECT_ROOT_DIR.joinpath('job_controller/config/common_job_example_config.py')},"
+ f"type=bind,source={_JOB_CONFIG_FILE},"
f"destination=/code/config/common_job_config.py",
])
if self._metadata.data_dir_mount is not None:
- _MEDIA_DIRECTORY_PATH.mkdir(parents=True, exist_ok=True)
+ _MEDIA_DIRECTORY.mkdir(parents=True, exist_ok=True)
_run_args.extend([
- "--mount", f"type=bind,source={_MEDIA_DIRECTORY_PATH},"
+ "--mount", f"type=bind,source={_MEDIA_DIRECTORY},"
f"destination={self._metadata.data_dir_mount}",
])
--
GitLab