mirror of
https://github.com/containers/podman.git
synced 2025-11-14 01:57:58 +08:00
update buildah to latest and use new network stack
Make sure buildah uses the new network stack. Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
5
vendor/github.com/containers/buildah/image.go
generated
vendored
5
vendor/github.com/containers/buildah/image.go
generated
vendored
@@ -239,6 +239,7 @@ func (i *containerImageRef) createConfigsAndManifests() (v1.Image, v1.Manifest,
|
||||
Versioned: specs.Versioned{
|
||||
SchemaVersion: 2,
|
||||
},
|
||||
MediaType: v1.MediaTypeImageManifest,
|
||||
Config: v1.Descriptor{
|
||||
MediaType: v1.MediaTypeImageConfig,
|
||||
},
|
||||
@@ -752,6 +753,10 @@ func (b *Builder) makeImageRef(options CommitOptions) (types.ImageReference, err
|
||||
if manifestType == "" {
|
||||
manifestType = define.OCIv1ImageManifest
|
||||
}
|
||||
|
||||
for _, u := range options.UnsetEnvs {
|
||||
b.UnsetEnv(u)
|
||||
}
|
||||
oconfig, err := json.Marshal(&b.OCIv1)
|
||||
if err != nil {
|
||||
return nil, errors.Wrapf(err, "error encoding OCI-format image configuration %#v", b.OCIv1)
|
||||
|
||||
Reference in New Issue
Block a user