added possibility to enable disable legacy-escape option

Author: Andrei Neagu

src/docker_publisher_osparc_services/cli.py

@@ -23,7 +23,7 @@
 )
 
 
-async def run_command(config: Path) -> None:
+async def run_command(config: Path, legacy_escape: bool) -> None:
     cfg = ConfigModel.from_cfg_path(config)
     print(cfg)
 
@@ -87,7 +87,7 @@ async def run_command(config: Path) -> None:
                     )
 
                     build_commands = get_commands_build_base(
-                        repo_model.pre_docker_build_hooks
+                        repo_model.pre_docker_build_hooks, legacy_escape
                     )
                     validate_commands_list(build_commands, env_vars)
 
@@ -124,9 +124,9 @@ async def run_command(config: Path) -> None:
 @click.command()
 @click.version_option(version=__version__)
 @click.argument("config", type=Path)
-def main(config: Path):
+def main(config: Path, legacy_escape: bool = False) -> None:
     """Interface to be used in CI"""
-    asyncio.get_event_loop().run_until_complete(run_command(config))
+    asyncio.get_event_loop().run_until_complete(run_command(config, legacy_escape))
 
 
 if __name__ == "__main__":

src/docker_publisher_osparc_services/gitlab_ci_setup/commands.py

@@ -13,18 +13,26 @@
 CommandList = List[str]
 
 
-def get_commands_build_base(pre_docker_build_hooks: list[str]) -> CommandList:
-    return [
-        "git clone ${SCCI_REPO} ${SCCI_CLONE_DIR}",
-        "cd ${SCCI_CLONE_DIR}",
-        DOCKER_LOGIN,
-        "ooil legacy-escape", 
-        "ooil compose",
-        *pre_docker_build_hooks,
-        "docker compose build",
-        "docker tag ${SCCI_IMAGE_NAME}:${SCCI_TAG} ${SCCI_TARGET_REGISTRY_ADDRESS}/${SCCI_TEST_IMAGE}:${SCCI_TAG}",
-        "docker push ${SCCI_TARGET_REGISTRY_ADDRESS}/${SCCI_TEST_IMAGE}:${SCCI_TAG}",
-    ]
+def get_commands_build_base(
+    pre_docker_build_hooks: list[str], legacy_escape: bool
+) -> CommandList:
+    return (
+        [
+            "git clone ${SCCI_REPO} ${SCCI_CLONE_DIR}",
+            "cd ${SCCI_CLONE_DIR}",
+            DOCKER_LOGIN,
+        ]
+        + ["ooil legacy-escape"]
+        if legacy_escape
+        else []
+        + [
+            "ooil compose",
+            *pre_docker_build_hooks,
+            "docker compose build",
+            "docker tag ${SCCI_IMAGE_NAME}:${SCCI_TAG} ${SCCI_TARGET_REGISTRY_ADDRESS}/${SCCI_TEST_IMAGE}:${SCCI_TAG}",
+            "docker push ${SCCI_TARGET_REGISTRY_ADDRESS}/${SCCI_TEST_IMAGE}:${SCCI_TAG}",
+        ]
+    )
 
 
 def get_commands_test_base() -> CommandList: