Bump github.com/fsouza/go-dockerclient from 1.5.0 to 1.6.0

Bumps [github.com/fsouza/go-dockerclient](https://github.com/fsouza/go-dockerclient) from 1.5.0 to 1.6.0.
- [Release notes](https://github.com/fsouza/go-dockerclient/releases)
- [Commits](fsouza/go-dockerclient@v1.5.0...v1.6.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>
Signed-off-by: Valentin Rothberg <[email protected]>

Closes: #1974
Approved by: rhatdan

Add builder labels

Add a bodge for the inspect test due to new labels.

Signed-off-by: caiges <[email protected]>

Export builder identity annotations.

Signed-off-by: caiges <[email protected]>

cmd/buildah/commit.go

@@ -162,9 +162,8 @@ func commitCmd(c *cobra.Command, args []string, iopts commitInputOptions) error
  }
  }
 
- // Add builder information.
- builder.SetLabel("org.opencontainers.image.builder.name", "buildah")
- builder.SetLabel("org.opencontainers.image.builder.version", buildah.Version)
+ // Add builder identity information.
+ builder.SetLabel(buildah.BuilderIdentityAnnotation, buildah.Version)
 
  options := buildah.CommitOptions{
  PreferredManifestType: format,

commit.go

@@ -29,6 +29,13 @@ import (
  "github.com/sirupsen/logrus"
 )
 
+const (
+ // BuilderIdentityAnnotation is the name of the annotation key containing 
+ // the name and version of the producer of the image stored as an
+ // annotation on commit.
+ BuilderIdentityAnnotation = "io.buildah"
+)
+
 // CommitOptions can be used to alter how an image is committed.
 type CommitOptions struct {
  // PreferredManifestType is the preferred type of image manifest. The

go.mod

@@ -14,7 +14,7 @@ require (
  github.com/docker/go-units v0.4.0
  github.com/docker/libnetwork v0.8.0-dev.2.0.20190625141545-5a177b73e316
  github.com/etcd-io/bbolt v1.3.3
- github.com/fsouza/go-dockerclient v1.5.0
+ github.com/fsouza/go-dockerclient v1.6.0
  github.com/ghodss/yaml v1.0.0
  github.com/hashicorp/go-multierror v1.0.0
  github.com/imdario/mergo v0.3.6 // indirect
@@ -43,7 +43,7 @@ require (
  github.com/vishvananda/netns v0.0.0-20190625233234-7109fa855b0f // indirect
  github.com/xeipuuv/gojsonschema v1.1.0 // indirect
  golang.org/x/crypto v0.0.0-20190927123631-a832865fa7ad
- golang.org/x/sys v0.0.0-20190902133755-9109b7679e13
+ golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3
  golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 // indirect
  google.golang.org/grpc v1.24.0 // indirect
  k8s.io/api v0.0.0-20190813020757-36bff7324fb7 // indirect

tests/commit.bats

@@ -117,3 +117,15 @@ load helpers
  buildah rm $cid
  buildah rmi -a
 }
+
+@test "commit-builder-identity" {
+ cid=$(buildah from --pull --signature-policy ${TESTSDIR}/policy.json alpine)
+ buildah commit --signature-policy ${TESTSDIR}/policy.json $cid alpine-image
+
+ buildah_version=$(buildah --version | awk '{ print $3 }')
+ version=$(buildah inspect --format '{{ index .Docker.Config.Labels "io.buildah"}}' alpine-image)
+
+ [ "$version" == "$buildah_version" ]
+ buildah rm $cid
+ buildah rmi -f alpine-image
+}