Change references to "docker" to "container"

Dockerfile

@@ -72,7 +72,7 @@ USER rapidtide
 # set up variable for non-interactive shell
 ENV PATH=/opt/miniforge3/envs/science/bin:/opt/miniforge3/condabin:.:/usr/local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
 
-ENV IN_DOCKER_CONTAINER=1
+ENV RUNNING_IN_CONTAINER=1
 
 WORKDIR /tmp/
 ENTRYPOINT ["/cloud/mount-and-run"]

rapidtide/util.py

@@ -464,13 +464,13 @@ def version():
 
     """
     try:
-        dummy = os.environ["IN_DOCKER_CONTAINER"]
+        dummy = os.environ["RUNNING_IN_CONTAINER"]
     except KeyError:
-        isdocker = False
+        iscontainer = False
     else:
-        isdocker = True
+        iscontainer = True
 
-    if isdocker:
+    if iscontainer:
         try:
             theversion = os.environ["GITVERSION"]
             if theversion.find("+") < 0:

rapidtide/workflows/happy.py

@@ -78,15 +78,15 @@ def happy_main(argparsingfunc):
     # create the canary file
     Path(f"{outputroot}_ISRUNNING.txt").touch()
 
-    # if we are running in a Docker container, make sure we enforce memory limits properly
+    # if we are running in a container, make sure we enforce memory limits properly
     try:
-        testval = os.environ["IN_DOCKER_CONTAINER"]
+        testval = os.environ["RUNNING_IN_CONTAINER"]
     except KeyError:
-        args.runningindocker = False
+        args.runningincontainer = False
     else:
-        args.runningindocker = True
-        args.dockermemfree, args.dockermemswap = tide_util.findavailablemem()
-        tide_util.setmemlimit(args.dockermemfree)
+        args.runningincontainer = True
+        args.containermemfree, args.containermemswap = tide_util.findavailablemem()
+        tide_util.setmemlimit(args.containermemfree)
 
     # Set up loggers for workflow
     setup_logger(

rapidtide/workflows/rapidtide.py

@@ -269,14 +269,14 @@ def rapidtide_main(argparsingfunc):
         gc.enable()
         print("turning on garbage collection")
 
-    # if we are running in a Docker container, make sure we enforce memory limits properly
-    if "IN_DOCKER_CONTAINER" in os.environ:
-        optiondict["runningindocker"] = True
-        optiondict["dockermemfree"], optiondict["dockermemswap"] = tide_util.findavailablemem()
-        if optiondict["dockermemfix"]:
-            tide_util.setmemlimit(optiondict["dockermemfree"])
+    # if we are running in a container, make sure we enforce memory limits properly
+    if "RUNNING_IN_CONTAINER" in os.environ:
+        optiondict["runningincontainer"] = True
+        optiondict["containermemfree"], optiondict["containermemswap"] = tide_util.findavailablemem()
+        if optiondict["containermemfix"]:
+            tide_util.setmemlimit(optiondict["containermemfree"])
     else:
-        optiondict["runningindocker"] = False
+        optiondict["runningincontainer"] = False
 
     # write out the current version of the run options
     optiondict["currentstage"] = "init"

rapidtide/workflows/rapidtide_parser.py

@@ -1667,10 +1667,10 @@ def _get_parser():
         default=False,
     )
     debugging.add_argument(
-        "--disabledockermemfix",
-        dest="dockermemfix",
+        "--disablecontainermemfix",
+        dest="containermemfix",
         action="store_false",
-        help=("Disable docker memory limit setting."),
+        help=("Disable container memory limit setting."),
         default=True,
     )
     debugging.add_argument(