Checkbox Provider - Docker snap

Merge ~sylvain-pineau/plainbox-provider-docker:fix-docker-inspect-arm into plainbox-provider-docker:master

  1. Git
  2. lp:~sylvain-pineau/plainbox-provider-docker
  3. fix-docker-inspect-arm
  4. Merge into master
Proposed by Sylvain Pineau
Status: Merged
Approved by: Sylvain Pineau
Approved revision: 257da85e3a1c4280b86c6b7d6ab617f518718af2
Merged at revision: 56d5a40aeeb681444c05eb5cb9046b7d23499352
Proposed branch: ~sylvain-pineau/plainbox-provider-docker:fix-docker-inspect-arm
Merge into: plainbox-provider-docker:master
Diff against target: 13 lines (+1/-1)
1 file modified
units/docker.pxu (+1/-1)
Reviewer Review Type Date Requested Status
Sylvain Pineau (community) Approve
Paul Larson Approve
Review via email: mp+381295@code.launchpad.net

Description of the change

Fix a bug affecting docker/inspect on arm

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

Assuming this doesn't need another patch somewhere else to add the image_prefix, +1

review: Approve
Revision history for this message
Sylvain Pineau (sylvain-pineau) wrote :

"image_prefix" is provided by the docker resource job

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/units/docker.pxu b/units/docker.pxu
2index 4243c9e..9f18f85 100644
3--- a/units/docker.pxu
4+++ b/units/docker.pxu
5@@ -156,7 +156,7 @@ command:
6 path=$(docker inspect -f {path} $ID)
7 image=$(docker inspect -f {image} $ID)
8 [ $path = "bash" ] || exit 1
9- [ $image = "ubuntu" ] || exit 1
10+ [ $image = "{image_prefix}ubuntu" ] || exit 1
11 docker rm -f $ID
12 _summary: Test query low-level information on a docker object
13 flags: simple preserve-cwd

Subscribers

People subscribed via source and target branches

to all changes: