From eee8824bdfe726457ac48e4841c4cd579dca63c0 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Thu, 23 Mar 2017 17:51:15 +0100 Subject: [PATCH] syscontainers: fix containers list --json Regression introduced with commit 1f67164a9661f5be6f801bad340495b33d35fefe Signed-off-by: Giuseppe Scrivano Closes: #949 Approved by: baude --- Atomic/backends/_ostree.py | 3 +-- Atomic/containers.py | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Atomic/backends/_ostree.py b/Atomic/backends/_ostree.py index b6ce614..7b70c4b 100644 --- a/Atomic/backends/_ostree.py +++ b/Atomic/backends/_ostree.py @@ -37,13 +37,12 @@ class OSTreeBackend(Backend): container.id = container_id container.runtime = info['Runtime'] container.image_name = info['Image'] - container.image_id = info['ImageID'] + container.image = info['ImageID'] container.created = info['Created'] container.status = container.state = runtime['status'] container.input_name = container_id container.original_structure = info container.deep = True - container.image = info['Image'] container.running = False if container.status == 'inactive' else True return container diff --git a/Atomic/containers.py b/Atomic/containers.py index aaa5936..b62276e 100644 --- a/Atomic/containers.py +++ b/Atomic/containers.py @@ -203,7 +203,7 @@ class Containers(Atomic): containers = [] for con_obj in con_objects: _con = {'id': con_obj.id, - 'image_id': con_obj.image_id, + 'image_id': con_obj.image, 'image_name': con_obj.image_name, 'command': con_obj.command, 'created': con_obj.created,