README.md

@@ -21,7 +21,7 @@ These are arguments that go between `otherworld` and the command.
 Name to assign to container (default: `otherworld_$USER`)
 
 ### --image=<image>
-Image to create the container with (default: `image_$CONTAINER_NAME`, or `debian:stable` if that image does not exist)
+Image to create the container with (default: `debian:stable`)
 
 ### --sudo
 Runs command as root, instead of current user.
@@ -29,9 +29,6 @@ Runs command as root, instead of current user.
 ### --rm
 Removes the specified container.
 
-### --rmi
-Removes image generated by the `otherworld` script (`image_$CONTAINER_NAME`)
-
 ### --commit
 Commits the container to an image named `image_$CONTAINER_NAME`.
 

otherworld

@@ -7,7 +7,7 @@ import sys
 import json
 
 CONTAINER_NAME = "otherworld"
-DEFAULT_IMAGE_NAME = "debian:stable"
+IMAGE_NAME = "debian:stable"
 
 def create_x11_mapping ():
     home = os.environ["HOME"]
@@ -72,9 +72,6 @@ def docker_commit (container, image_name):
 def docker_rm (container):
     call(["docker", "rm", "-f", container])
 
-def docker_rmi (container):
-    call(["docker", "rmi", "-f", container])
-
 def docker_build (build_path, options, image_name):
     check_call(["docker", "build"] + options + ["-t", image_name, build_path])
     return image_name
@@ -113,7 +110,7 @@ def expand_user_volumes (volumes):
 
 user = os.environ["USER"]
 uid = int(check_output(["id", "-u"]).strip())
-image_name = os.environ.get("OW_IMAGE", None)
+image_name = os.environ.get("OW_IMAGE", IMAGE_NAME)
 container_name = os.environ.get("OW_CONTAINER", f"{CONTAINER_NAME}_{user}")
 build_path = None
 
@@ -122,8 +119,6 @@ command_user = user
 user_volumes = USER_VOLUMES
 pull = False
 
-actions = []
-
 command_env = {}
 
 quiet = False
@@ -133,20 +128,25 @@ while len(command) > 0:
         command = command[1:]
         quiet = True
     elif arg == "--rm":
-        actions.append("rm")
+        if not quiet:
-        command = command[1:]
+            print(f">> Removing container: {container_name}")
-    elif arg == "--rmi":
+        docker_rm(container_name)
-        actions.append("rmi")
+        sys.exit(0)
-        command = command[1:]
     elif arg == "--commit":
-        actions.append("commit")
+        image_name = get_generated_image_name(container_name)
-        command = command[1:]
+        if not quiet:
+            print(f">> Committing container: {container_name} to image: {image_name}")
+        docker_commit(container_name, image_name)
+        sys.exit(0)
     elif arg == "--sudo":
         command_user = "root"
         command = command[1:]
     elif arg.startswith("--container="):
         container_name = arg[len("--container="):]
         command = command[1:]
+    elif arg.startswith("--image"):
+        image_name = get_generated_image_name(container_name)
+        command = command[1:]
     elif arg.startswith("--image="):
         image_name = arg[len("--image="):]
         command = command[1:]
@@ -167,28 +167,7 @@ while len(command) > 0:
     else:
         break
 
-if actions:
+if len(command) == 0:
-    if "commit" in actions:
-        target_image_name = get_generated_image_name(container_name)
-        if not quiet:
-            print(f">> Committing container: {container_name} to image: {target_image_name}")
-        docker_commit(container_name, target_image_name)
-    
-    if "rm" in actions:
-        if not quiet:
-            print(f">> Removing container: {container_name}")
-        docker_rm(container_name)
-
-    if "rmi" in actions:
-        target_image_name = get_generated_image_name(container_name)
-        if not quiet:
-            print(f">> Removing image: {target_image_name}")
-        docker_rmi(target_image_name)
-
-    if not command:
-        sys.exit(0)
-
-if not command:
     command = DEFAULT_COMMAND
 
 container = None
@@ -198,19 +177,7 @@ except Exception:
     build_path = resolve_build_path(build_path)
     if build_path is not None:
         image_name = docker_build(build_path, ["--pull"] if pull else [], get_generated_image_name(container_name))
-    else:
+    elif pull:
-        if image_name is None:
-            image_name = get_generated_image_name(container_name)
-            try:
-                docker_inspect(image_name)
-                if not quiet:
-                    print(f">> Using default otherworld image {image_name}")
-            except Exception:
-                if not quiet:
-                    print(f">> Default otherworld image {image_name} not found, falling back to {DEFAULT_IMAGE_NAME}")
-                image_name = DEFAULT_IMAGE_NAME
-
-        if pull:
         docker_pull(image_name)
 
     if not quiet: