update compatible with aws mode

Author: marcwimmer

wodoo/lib_bakery.py

@@ -141,6 +141,12 @@ def bake(ctx, config, params, no_update_images):
           * odoo setting RUN_CRONJOBS=0
         """,
         "7. Setting up connection to database and other settings",
+        "8. To configure odoo container to make updates at startup, configure:",
+        """
+          * UPDATE_ON_STARTUP=1
+          * UPDATE_PARAMS=--i18n  --> parameter for update command; e.g. in this case for force update translations
+          * PERSIST_UPDATE_LOG=/path/to/persist/   <!-- update log will be put here
+        """
     ]
     for tip in tips:
         click.secho(tip, fg="green")

wodoo/lib_control_with_docker.py

@@ -399,7 +399,10 @@ def logall(config, machines, follow, lines):
 
 def shell(config, command="", queuejobs=False):
     if os.getenv("DOCKER_MACHINE") == "1":
-        subprocess.run(["/odoolib/entrypoint.sh", "/odoolib/shell.py"])
+        cmdline = ["/odoolib/entrypoint.sh", "/odoolib/shell.py"]
+        if command:
+            cmdline += [command]
+        subprocess.run(cmdline)
         return
     cmd = [
         "run",

wodoo/lib_module.py

@@ -815,7 +815,7 @@ def extract_progress(text):
             else:
                 break
 
-        if not no_restart and config.use_docker:
+        if not no_restart and config.use_docker and os.getenv("DOCKER_MACHINE") != "1":
             Commands.invoke(ctx, "restart", machines=["odoo"])
             if config.run_odoocronjobs:
                 Commands.invoke(ctx, "restart", machines=["odoo_cronjobs"])
@@ -1102,7 +1102,8 @@ def _uninstall_marked_modules(ctx, config, modules, no_restart=False):
         uninstalled = True
 
     if uninstalled and not no_restart:
-        Commands.invoke(ctx, "restart", machines=["odoo"])
+        if os.getenv("DOCKER_MACHINE") != "1":
+            Commands.invoke(ctx, "restart", machines=["odoo"])
 
     modules = [x for x in modules if DBModules.is_module_installed(x)]
     if modules:
@@ -1209,31 +1210,32 @@ def _exec_update(
     if os.getenv("DOCKER_MACHINE") == "1":
         ret =  subprocess.run([os.getenv("WODOO_PYTHON")] + ["/odoolib/update_modules.py"] + params)
         yield ret.returncode
-    params = ["odoo_update", "/odoolib/update_modules.py"] + params
-    if not non_interactive:
-        yield __cmd_interactive(
-            config,
-            *(
-                [
-                    "run",
-                    "--rm",
-                ]
-                + params
-            ),
-        )
     else:
-        try:
-            returncode, output = __dcrun(
+        params = ["odoo_update", "/odoolib/update_modules.py"] + params
+        if not non_interactive:
+            yield __cmd_interactive(
                 config,
-                list(params),
-                returnproc=True,
-                interactive=False,
-                write_to_console=write_to_console,
+                *(
+                    [
+                        "run",
+                        "--rm",
+                    ]
+                    + params
+                ),
             )
-            yield returncode
-            yield output
-        except subprocess.CalledProcessError as ex:
-            yield ex.returncode
+        else:
+            try:
+                returncode, output = __dcrun(
+                    config,
+                    list(params),
+                    returnproc=True,
+                    interactive=False,
+                    write_to_console=write_to_console,
+                )
+                yield returncode
+                yield output
+            except subprocess.CalledProcessError as ex:
+                yield ex.returncode
 
 
 def _get_unittests_from_module(module_name):