From 3ae72219b4fb3eaffe87b566e8327564bca427ab Mon Sep 17 00:00:00 2001 From: Jesse Wattenbarger Date: Tue, 13 Jun 2023 14:41:33 -0400 Subject: [PATCH] Change parsing of docker info in dev build This is a non-functional change. The way os_info is populated with docker info and grep 'Operating System' breaks on podman and likely in other places. This makes it work on both podman and docker, and it will continue to return the exact same strings everywhere else. --- tools/docker-compose/ansible/roles/sources/tasks/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/docker-compose/ansible/roles/sources/tasks/main.yml b/tools/docker-compose/ansible/roles/sources/tasks/main.yml index def04456ed48..4c3052886541 100644 --- a/tools/docker-compose/ansible/roles/sources/tasks/main.yml +++ b/tools/docker-compose/ansible/roles/sources/tasks/main.yml @@ -67,7 +67,7 @@ - name: Get OS info for sdb shell: | - docker info | grep 'Operating System' + docker info 2> /dev/null | awk '/Os:/ { gsub(/Os:/, "Operating System:"); }/Operating System/ { print; }' register: os_info changed_when: false