mirror of
https://github.com/containers/podman.git
synced 2025-08-06 19:44:14 +08:00
build(deps): bump github.com/openshift/imagebuilder
Bumps [github.com/openshift/imagebuilder](https://github.com/openshift/imagebuilder) from 1.2.4-0.20230207193036-6e08c897da73 to 1.2.4. - [Release notes](https://github.com/openshift/imagebuilder/releases) - [Commits](https://github.com/openshift/imagebuilder/commits/v1.2.4) --- updated-dependencies: - dependency-name: github.com/openshift/imagebuilder dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
19
vendor/github.com/fsouza/go-dockerclient/image.go
generated
vendored
19
vendor/github.com/fsouza/go-dockerclient/image.go
generated
vendored
@ -469,6 +469,14 @@ func (c *Client) ImportImage(opts ImportImageOptions) error {
|
||||
return c.createImage(&opts, nil, opts.InputStream, opts.OutputStream, opts.RawJSONStream, opts.InactivityTimeout, opts.Context)
|
||||
}
|
||||
|
||||
// BuilderVersion represents either the BuildKit or V1 ("classic") builder.
|
||||
type BuilderVersion string
|
||||
|
||||
const (
|
||||
BuilderV1 BuilderVersion = "1"
|
||||
BuilderBuildKit BuilderVersion = "2"
|
||||
)
|
||||
|
||||
// BuildImageOptions present the set of informations available for building an
|
||||
// image from a tarfile with a Dockerfile in it.
|
||||
//
|
||||
@ -504,11 +512,12 @@ type BuildImageOptions struct {
|
||||
Target string
|
||||
Outputs string `ver:"1.40"`
|
||||
NoCache bool
|
||||
SuppressOutput bool `qs:"q"`
|
||||
Pull bool `ver:"1.16"`
|
||||
RmTmpContainer bool `qs:"rm"`
|
||||
ForceRmTmpContainer bool `qs:"forcerm" ver:"1.12"`
|
||||
RawJSONStream bool `qs:"-"`
|
||||
SuppressOutput bool `qs:"q"`
|
||||
Pull bool `ver:"1.16"`
|
||||
RmTmpContainer bool `qs:"rm"`
|
||||
ForceRmTmpContainer bool `qs:"forcerm" ver:"1.12"`
|
||||
RawJSONStream bool `qs:"-"`
|
||||
Version BuilderVersion `qs:"version" ver:"1.39"`
|
||||
}
|
||||
|
||||
// BuildArg represents arguments that can be passed to the image when building
|
||||
|
4
vendor/github.com/fsouza/go-dockerclient/network.go
generated
vendored
4
vendor/github.com/fsouza/go-dockerclient/network.go
generated
vendored
@ -246,8 +246,8 @@ type EndpointConfig struct {
|
||||
//
|
||||
// See https://goo.gl/RV7BJU for more details.
|
||||
type EndpointIPAMConfig struct {
|
||||
IPv4Address string `json:",omitempty"`
|
||||
IPv6Address string `json:",omitempty"`
|
||||
IPv4Address string `json:",omitempty" yaml:"IPv4Address,omitempty"`
|
||||
IPv6Address string `json:",omitempty" yaml:"IPv6Address,omitempty"`
|
||||
}
|
||||
|
||||
// ConnectNetwork adds a container to a network or returns an error in case of
|
||||
|
6
vendor/github.com/fsouza/go-dockerclient/tar.go
generated
vendored
6
vendor/github.com/fsouza/go-dockerclient/tar.go
generated
vendored
@ -13,7 +13,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/docker/docker/pkg/archive"
|
||||
"github.com/docker/docker/pkg/fileutils"
|
||||
"github.com/moby/patternmatcher"
|
||||
)
|
||||
|
||||
func createTarStream(srcPath, dockerfilePath string) (io.ReadCloser, error) {
|
||||
@ -44,7 +44,7 @@ func createTarStream(srcPath, dockerfilePath string) (io.ReadCloser, error) {
|
||||
if includeFile == "" {
|
||||
continue
|
||||
}
|
||||
keepThem, err := fileutils.Matches(includeFile, excludes)
|
||||
keepThem, err := patternmatcher.Matches(includeFile, excludes)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("cannot match .dockerfileignore: '%s', error: %w", includeFile, err)
|
||||
}
|
||||
@ -73,7 +73,7 @@ func validateContextDirectory(srcPath string, excludes []string) error {
|
||||
// skip this directory/file if it's not in the path, it won't get added to the context
|
||||
if relFilePath, relErr := filepath.Rel(srcPath, filePath); relErr != nil {
|
||||
return relErr
|
||||
} else if skip, matchErr := fileutils.Matches(relFilePath, excludes); matchErr != nil {
|
||||
} else if skip, matchErr := patternmatcher.Matches(relFilePath, excludes); matchErr != nil {
|
||||
return matchErr
|
||||
} else if skip {
|
||||
if f.IsDir() {
|
||||
|
Reference in New Issue
Block a user