Merge branch 'master' into develop

Author: alishamayor

docs/TROUBLESHOOTING.md

@@ -6,6 +6,7 @@
 * [Container Debugging](#container-debugging)
     * [Getting logs](#getting-logs)
     * [Interactive shell](#interactive-shell)
+    * [Installing packages](#installing-packages)
     * [Debug variables](#debug-variables)
     * [No-provision](#no-provision)
     * [Generate Splunk diag](#generate-splunk-diag)
@@ -56,7 +57,7 @@ To gain interactive shell access to the container's runtime as the splunk user,
 $ docker exec -it -u splunk <container_name/container_id> /bin/bash
 ```
 
-#### Installing Packages
+#### Installing packages
 Once inside the container, you can install additional packages with the default package manager:
 ```
 $ microdnf install <package_name>

tests/test_docker_splunk.py

@@ -423,6 +423,28 @@ def test_splunk_uid_gid(self):
             if cid:
                 self.client.remove_container(cid, v=True, force=True)
 
+    def test_splunk_uid_gid(self):
+        cid = None
+        try:
+            # Run container
+            cid = self.client.create_container(self.SPLUNK_IMAGE_NAME, tty=True, command="no-provision")
+            cid = cid.get("Id")
+            self.client.start(cid)
+            # Wait a bit
+            time.sleep(5)
+            # If the container is still running, we should be able to exec inside
+            # Check that the git SHA exists in /opt/ansible
+            exec_command = self.client.exec_create(cid, "id", user="splunk")
+            std_out = self.client.exec_start(exec_command)
+            assert "uid=41812" in std_out
+            assert "gid=41812" in std_out
+        except Exception as e:
+            self.logger.error(e)
+            raise e
+        finally:
+            if cid:
+                self.client.remove_container(cid, v=True, force=True)
+    
     def test_uf_entrypoint_help(self):
         # Run container
         cid = self.client.create_container(self.UF_IMAGE_NAME, tty=True, command="help")
@@ -506,6 +528,28 @@ def test_uf_uid_gid(self):
             if cid:
                 self.client.remove_container(cid, v=True, force=True)
 
+    def test_uf_uid_gid(self):
+        cid = None
+        try:
+            # Run container
+            cid = self.client.create_container(self.UF_IMAGE_NAME, tty=True, command="no-provision")
+            cid = cid.get("Id")
+            self.client.start(cid)
+            # Wait a bit
+            time.sleep(5)
+            # If the container is still running, we should be able to exec inside
+            # Check that the git SHA exists in /opt/ansible
+            exec_command = self.client.exec_create(cid, "id", user="splunk")
+            std_out = self.client.exec_start(exec_command)
+            assert "uid=41812" in std_out
+            assert "gid=41812" in std_out
+        except Exception as e:
+            self.logger.error(e)
+            raise e
+        finally:
+            if cid:
+                self.client.remove_container(cid, v=True, force=True)
+    
     def test_adhoc_1so_using_default_yml(self):
         # Generate default.yml
         cid = self.client.create_container(self.SPLUNK_IMAGE_NAME, tty=True, command="create-defaults")