mirror of
https://github.com/containers/podman.git
synced 2025-08-06 19:44:14 +08:00
migrate Podman to containers/common/libimage
Migrate the Podman code base over to `common/libimage` which replaces `libpod/image` and a lot of glue code entirely. Note that I tried to leave bread crumbs for changed tests. Miscellaneous changes: * Some errors yield different messages which required to alter some tests. * I fixed some pre-existing issues in the code. Others were marked as `//TODO`s to prevent the PR from exploding. * The `NamesHistory` of an image is returned as is from the storage. Previously, we did some filtering which I think is undesirable. Instead we should return the data as stored in the storage. * Touched handlers use the ABI interfaces where possible. * Local image resolution: previously Podman would match "foo" on "myfoo". This behaviour has been changed and Podman will now only match on repository boundaries such that "foo" would match "my/foo" but not "myfoo". I consider the old behaviour to be a bug, at the very least an exotic corner case. * Futhermore, "foo:none" does *not* resolve to a local image "foo" without tag anymore. It's a hill I am (almost) willing to die on. * `image prune` prints the IDs of pruned images. Previously, in some cases, the names were printed instead. The API clearly states ID, so we should stick to it. * Compat endpoint image removal with _force_ deletes the entire not only the specified tag. Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
4
vendor/github.com/openshift/imagebuilder/README.md
generated
vendored
4
vendor/github.com/openshift/imagebuilder/README.md
generated
vendored
@ -102,6 +102,8 @@ Example of usage from OpenShift's experimental `dockerbuild` [command with mount
|
||||
## Run conformance tests (very slow):
|
||||
|
||||
```
|
||||
docker rmi busybox; docker pull busybox
|
||||
docker rmi centos:7; docker pull centos:7
|
||||
chmod -R go-w ./dockerclient/testdata
|
||||
go test ./dockerclient/conformance_test.go -tags conformance -timeout 30m
|
||||
go test ./dockerclient -tags conformance -timeout 30m
|
||||
```
|
||||
|
4
vendor/github.com/openshift/imagebuilder/builder.go
generated
vendored
4
vendor/github.com/openshift/imagebuilder/builder.go
generated
vendored
@ -37,6 +37,8 @@ type Copy struct {
|
||||
type Run struct {
|
||||
Shell bool
|
||||
Args []string
|
||||
// Mounts are mounts specified through the --mount flag inside the Containerfile
|
||||
Mounts []string
|
||||
}
|
||||
|
||||
type Executor interface {
|
||||
@ -67,7 +69,7 @@ func (logExecutor) Copy(excludes []string, copies ...Copy) error {
|
||||
}
|
||||
|
||||
func (logExecutor) Run(run Run, config docker.Config) error {
|
||||
log.Printf("RUN %v %t (%v)", run.Args, run.Shell, config.Env)
|
||||
log.Printf("RUN %v %v %t (%v)", run.Args, run.Mounts, run.Shell, config.Env)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
21
vendor/github.com/openshift/imagebuilder/dispatchers.go
generated
vendored
21
vendor/github.com/openshift/imagebuilder/dispatchers.go
generated
vendored
@ -306,7 +306,26 @@ func run(b *Builder, args []string, attributes map[string]bool, flagArgs []strin
|
||||
|
||||
args = handleJSONArgs(args, attributes)
|
||||
|
||||
run := Run{Args: args}
|
||||
var mounts []string
|
||||
userArgs := mergeEnv(envMapAsSlice(b.Args), b.Env)
|
||||
for _, a := range flagArgs {
|
||||
arg, err := ProcessWord(a, userArgs)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
switch {
|
||||
case strings.HasPrefix(arg, "--mount="):
|
||||
mount := strings.TrimPrefix(arg, "--mount=")
|
||||
mounts = append(mounts, mount)
|
||||
default:
|
||||
return fmt.Errorf("RUN only supports the --mount flag")
|
||||
}
|
||||
}
|
||||
|
||||
run := Run{
|
||||
Args: args,
|
||||
Mounts: mounts,
|
||||
}
|
||||
|
||||
if !attributes["json"] {
|
||||
run.Shell = true
|
||||
|
2
vendor/github.com/openshift/imagebuilder/imagebuilder.spec
generated
vendored
2
vendor/github.com/openshift/imagebuilder/imagebuilder.spec
generated
vendored
@ -12,7 +12,7 @@
|
||||
#
|
||||
|
||||
%global golang_version 1.8.1
|
||||
%{!?version: %global version 1.2.0}
|
||||
%{!?version: %global version 1.2.2-dev}
|
||||
%{!?release: %global release 1}
|
||||
%global package_name imagebuilder
|
||||
%global product_name Container Image Builder
|
||||
|
Reference in New Issue
Block a user