981.update podman build

fre/make/gfdlfremake/buildDocker.py

@@ -236,10 +236,16 @@ def createBuildScript(self, platform, skip_format_transfer):
         platform_tag = self.target.gettargetName().lower()
 
         self.userScript = ["#!/bin/bash\n", "set -ex\n"]
+
+        # Construct container build command
+        self.userScript.append(f"{containerBuild} build ")
+        if containerBuild == "podman":
+            self.userScript.append("--network host ")
         if container_volume:
-            self.userScript.append(f"{containerBuild} build --volume {container_volume}:{container_volume} -f Dockerfile -t {registry_tag}:{platform_tag}\n")
-        else:
-            self.userScript.append(f"{containerBuild} build -f Dockerfile -t {registry_tag}:{platform_tag}\n")
+            self.userScript.append(f"--volume {container_volume}:{container_volume} " )
+
+        self.userScript.append(f"-f Dockerfile -t {registry_tag}:{platform_tag}\n")
+
 
         if not skip_format_transfer:
             # Remove any previously generated images, if they exist

fre/make/tests/compilation/test_run_fremake_builds.py

@@ -142,5 +142,5 @@ def test_run_fremake_container_build_fail():
     stderr = run.stderr
 
     #Check that the incorrect line specifically prints in the stderr
-    fail_step = "podman build -f Dockerfile-wrong"
+    fail_step = "podman build --network host -f Dockerfile-wrong"
     assert fail_step in str(stderr)

fre/make/tests/test_create_dockerfile.py

@@ -143,7 +143,8 @@ def test_build_script_contents():
     with open('createContainer.sh', 'r') as f:
         lines = f.readlines()
 
-    expected_volume_mount = "podman build --volume /gpfs/f5:/gpfs/f5 -f Dockerfile -t null_model_full:debug"
+    expected_volume_mount = ("podman build --network host --volume /gpfs/f5:/gpfs/f5 "
+                             "-f Dockerfile -t null_model_full:debug")
 
     # strip off '\n'
     container_build_script = []