gather: suffix container logs with container ids for uniqueness

openshift · May 8, 2019 · 5177e74 · 5177e74
1 parent 6e5093d
commit 5177e74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/data/data/bootstrap/files/usr/local/bin/installer-gather.sh b/data/data/bootstrap/files/usr/local/bin/installer-gather.sh
@@ -14,8 +14,8 @@ mkdir -p "${ARTIFACTS}/bootstrap/containers"
 sudo crictl ps --all --quiet | while read -r container
 do
     container_name="$(sudo crictl ps -a --id "${container}" -v | grep -oP "Name: \\K(.*)")"
-    sudo crictl logs "${container}" >& "${ARTIFACTS}/bootstrap/containers/${container_name}.log"
-    sudo crictl inspect "${container}" >& "${ARTIFACTS}/bootstrap/containers/${container_name}.inspect"
+    sudo crictl logs "${container}" >& "${ARTIFACTS}/bootstrap/containers/${container_name}-${container}.log"
+    sudo crictl inspect "${container}" >& "${ARTIFACTS}/bootstrap/containers/${container_name}-${container}.inspect"
 done
 mkdir -p "${ARTIFACTS}/bootstrap/pods"
 sudo podman ps --all --quiet | while read -r container

diff --git a/data/data/bootstrap/files/usr/local/bin/installer-masters-gather.sh b/data/data/bootstrap/files/usr/local/bin/installer-masters-gather.sh
@@ -15,8 +15,8 @@ mkdir -p "${ARTIFACTS}/containers"
 for container in $(crictl ps --all --quiet)
 do
     container_name=$(crictl ps -a --id "${container}" -v | grep -oP "Name: \\K(.*)")
-    crictl logs "${container}" >& "${ARTIFACTS}/containers/${container_name}.log"
-    crictl inspect "${container}" >& "${ARTIFACTS}/containers/${container_name}.inspect"
+    crictl logs "${container}" >& "${ARTIFACTS}/containers/${container_name}-${container}.log"
+    crictl inspect "${container}" >& "${ARTIFACTS}/containers/${container_name}-${container}.inspect"
 done
 for container in $(podman ps --all --quiet)
 do