idaholab#310, have install.py offer to pull the docker images

mmguero-dev · Dec 7, 2023 · d544339 · d544339
1 parent c60ae37
commit d544339
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/docs/ubuntu-install-example.md b/docs/ubuntu-install-example.md
@@ -179,7 +179,7 @@ Scan extracted PE files with Capa? (y / N): y
 
 Lookup extracted file hashes with VirusTotal? (y / N): n
 
-Download updated file scanner signatures periodically? (n/Y): y
+Download updated file scanner signatures periodically? (Y / n): n
 
 Should Malcolm run and maintain an instance of NetBox, an infrastructure resource modeling tool? (y / N): n
 
@@ -190,7 +190,9 @@ Should Malcolm capture live network traffic? 2
 
 Specify capture interface(s) (comma-separated): eth0
 
-Enable dark mode for OpenSearch Dashboards? (n/Y): y
+Enable dark mode for OpenSearch Dashboards? (Y / n): y
+
+Pull Malcolm Docker images (y / N): y
 
 Malcolm has been installed to /home/user/Malcolm. See README.md for more information.
 Scripts for starting and stopping Malcolm and changing authentication-related settings can be found in /home/user/Malcolm/scripts.
@@ -227,7 +229,7 @@ As an alternative to manually copying the files to the sensor, Malcolm can facil
 
 In this example, rather than [building Malcolm from scratch](development.md#Build), images may be pulled from [GitHub](https://github.com/orgs/idaholab/packages?repo_name=Malcolm):
 ```
-user@host:~/Malcolm$ docker compose pull
+user@host:~/Malcolm$ docker compose --profile=malcolm pull
 Pulling api               ... done
 Pulling arkime            ... done
 Pulling dashboards        ... done

diff --git a/scripts/install.py b/scripts/install.py
@@ -3994,17 +3994,18 @@ def main():
     if (installPath is not None) and os.path.isdir(installPath):
         if hasattr(installer, 'tweak_malcolm_runtime'):
             installer.tweak_malcolm_runtime(installPath)
-            eprint(f"\nMalcolm has been installed to {installPath}. See README.md for more information.")
-            eprint(
-                f"Scripts for starting and stopping Malcolm and changing authentication-related settings can be found in {os.path.join(installPath, 'scripts')}."
-            )
+
         if (
             (not args.configOnly)
             and (orchMode is OrchestrationFramework.DOCKER_COMPOSE)
             and hasattr(installer, 'install_docker_images')
         ):
             success = installer.install_docker_images(imageFile, installPath)
 
+        InstallerDisplayMessage(
+            f"Malcolm has been installed to {installPath}. See README.md for more information.\nScripts for starting and stopping Malcolm and changing authentication-related settings can be found in {os.path.join(installPath, 'scripts')}."
+        )
+
 
 if __name__ == '__main__':
     main()