From 5d1a53eacd0845228398f52b7615209ac7a8d269 Mon Sep 17 00:00:00 2001 From: Sachin Kumar <sachinkum123567@gmail.com> Date: Thu, 29 Aug 2024 17:25:07 +0200 Subject: [PATCH 1/6] disable upgrade flag added --- rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py | 11 ++++++++++- rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py | 8 ++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py b/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py index a2e0c151..a15afa24 100644 --- a/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py +++ b/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py @@ -122,6 +122,7 @@ class CreateVerbArgs: repos_no_skip_existing: bool = False disable_nvidia: bool = False docker: bool = False + disable_upgrade: bool = False @property def ws_name(self) -> str: @@ -385,6 +386,14 @@ def add_arguments(self, parser: argparse.ArgumentParser, cli_name: str): help="Disable nvidia rocker flag", default=False, ) + parser.add_argument( + "--disable-upgrade", + action="store_true", + help="Disable upgrade flag", + default=False, + ) + + parser.add_argument( "--ws-repos-file-name", type=str, @@ -601,7 +610,7 @@ def generate_intermediate_dockerfile_content(self, create_args: CreateVerbArgs) return textwrap.dedent( f""" FROM {create_args.base_image_name} - RUN apt-get update && apt-get upgrade -y + RUN apt-get update {"&& apt-get upgrade -y" if not create_args.disable_upgrade else ""} {apt_packages_cmd} {python_packages_cmd} {rtw_clone_cmd} diff --git a/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py b/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py index 06a87e7a..e1a0ff69 100644 --- a/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py +++ b/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py @@ -36,6 +36,7 @@ class ImportVerbArgs: standalone_docker_image: str docker: bool = True disable_nvidia: bool = False + disable_upgrade: bool = False standalone: bool = True final_image_name: str = "" container_name: str = "" @@ -88,6 +89,12 @@ def add_arguments(self, parser: argparse.ArgumentParser, cli_name: str): help="Disable nvidia rocker flag", default=False, ) + parser.add_argument( + "--disable-upgrade", + action="store_true", + help="Disable upgrade flag", + default=False, + ) parser.add_argument( "--final-image-name", type=str, @@ -134,6 +141,7 @@ def main(self, *, args): import_args = ImportVerbArgs(**filtered_args) rocker_flags = generate_rocker_flags( disable_nvidia=import_args.disable_nvidia, + disable_upgrade=import_args.disable_upgrade, container_name=import_args.container_name, hostname=import_args.hostname, ssh_abs_path=import_args.ssh_abs_path, From 2141f397ee90491c755595dbc3124bbd714020e4 Mon Sep 17 00:00:00 2001 From: Sachin Kumar <sachinkum123567@gmail.com> Date: Fri, 30 Aug 2024 11:09:12 +0200 Subject: [PATCH 2/6] style: fix E303 by removing extra blank lines in create_verb.py --- rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py b/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py index a15afa24..e62e5301 100644 --- a/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py +++ b/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py @@ -392,8 +392,6 @@ def add_arguments(self, parser: argparse.ArgumentParser, cli_name: str): help="Disable upgrade flag", default=False, ) - - parser.add_argument( "--ws-repos-file-name", type=str, From 89518e47f10e7cf47bb665fc5e7ebb87d84d50c4 Mon Sep 17 00:00:00 2001 From: Sachin Kumar <sachinkum123567@gmail.com> Date: Fri, 30 Aug 2024 15:21:19 +0200 Subject: [PATCH 3/6] Remove mistakenly added disable_upgrade parameter from generate_rocker_flags --- rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py b/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py index e1a0ff69..d596e352 100644 --- a/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py +++ b/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py @@ -141,7 +141,6 @@ def main(self, *, args): import_args = ImportVerbArgs(**filtered_args) rocker_flags = generate_rocker_flags( disable_nvidia=import_args.disable_nvidia, - disable_upgrade=import_args.disable_upgrade, container_name=import_args.container_name, hostname=import_args.hostname, ssh_abs_path=import_args.ssh_abs_path, From f9b298303b0af39ef68dc4f33a91441907eaedfc Mon Sep 17 00:00:00 2001 From: Sachin Kumar <sachinkum123567@gmail.com> Date: Mon, 2 Sep 2024 12:03:01 +0200 Subject: [PATCH 4/6] :zap: removed disable upgrade flag from import verb --- rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py b/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py index d596e352..04e03a54 100644 --- a/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py +++ b/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py @@ -36,7 +36,6 @@ class ImportVerbArgs: standalone_docker_image: str docker: bool = True disable_nvidia: bool = False - disable_upgrade: bool = False standalone: bool = True final_image_name: str = "" container_name: str = "" From 9c1bb7d70813602a114caf45b917e2c947270e74 Mon Sep 17 00:00:00 2001 From: Manuel Muth <mamueluth@gmail.com> Date: Tue, 3 Sep 2024 12:09:16 +0200 Subject: [PATCH 5/6] remove disable upgrade flag from import --- rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py b/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py index 04e03a54..06a87e7a 100644 --- a/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py +++ b/rtwcli/rtw_cmds/rtw_cmds/workspace/import_verb.py @@ -88,12 +88,6 @@ def add_arguments(self, parser: argparse.ArgumentParser, cli_name: str): help="Disable nvidia rocker flag", default=False, ) - parser.add_argument( - "--disable-upgrade", - action="store_true", - help="Disable upgrade flag", - default=False, - ) parser.add_argument( "--final-image-name", type=str, From 342afba01da4d9c0004e08052040836031dc251b Mon Sep 17 00:00:00 2001 From: Manuel Muth <mamueluth@gmail.com> Date: Tue, 3 Sep 2024 12:18:11 +0200 Subject: [PATCH 6/6] Update rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py --- rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py b/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py index e62e5301..e0e8694e 100644 --- a/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py +++ b/rtwcli/rtw_cmds/rtw_cmds/workspace/create_verb.py @@ -389,7 +389,7 @@ def add_arguments(self, parser: argparse.ArgumentParser, cli_name: str): parser.add_argument( "--disable-upgrade", action="store_true", - help="Disable upgrade flag", + help="Disable execution of 'apt-get upgrade' when creating workspace.", default=False, ) parser.add_argument(