diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-04-20 20:18:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-20 20:18:48 -0400 |
| commit | 89276a5f92717c4c6a299ca2be182a3797d9c90d (patch) | |
| tree | bfc8718c43604555ed518ae0c3365f78e3f2948e /pkg/api | |
| parent | b7714672247e2674303c46fa93b12cbf047b0204 (diff) | |
| parent | 48e7bae4e01627aa2ca2df83e3b8c0e53bcd5b6e (diff) | |
| download | podman-89276a5f92717c4c6a299ca2be182a3797d9c90d.tar.gz podman-89276a5f92717c4c6a299ca2be182a3797d9c90d.tar.bz2 podman-89276a5f92717c4c6a299ca2be182a3797d9c90d.zip | |
Merge pull request #5883 from abitrolly/patch-3
Return labes in API (fixes #5882)
Diffstat (limited to 'pkg/api')
| -rw-r--r-- | pkg/api/handlers/types.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/api/handlers/types.go b/pkg/api/handlers/types.go index 4c081cf85..4c5e38437 100644 --- a/pkg/api/handlers/types.go +++ b/pkg/api/handlers/types.go @@ -311,7 +311,7 @@ func ImageDataToImageInspect(ctx context.Context, l *libpodImage.Image) (*ImageI // NetworkDisabled: false, // MacAddress: "", // OnBuild: nil, - // Labels: nil, + Labels: info.Labels, // StopSignal: "", // StopTimeout: nil, // Shell: nil, |