From 0f7d54b0260c1be992ee3b9cee359ef3a9e8bd21 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Thu, 22 Apr 2021 08:01:12 +0200 Subject: 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 --- test/e2e/testdata/docker-name-only.tar.xz | Bin 0 -> 1024 bytes test/e2e/testdata/docker-registry-name.tar.xz | Bin 0 -> 1028 bytes test/e2e/testdata/docker-two-images.tar.xz | Bin 0 -> 1416 bytes test/e2e/testdata/docker-two-names.tar.xz | Bin 0 -> 1040 bytes test/e2e/testdata/docker-unnamed.tar.xz | Bin 0 -> 968 bytes test/e2e/testdata/image | 1 - test/e2e/testdata/oci-name-only.tar.gz | Bin 0 -> 975 bytes test/e2e/testdata/oci-non-docker-name.tar.gz | Bin 0 -> 991 bytes test/e2e/testdata/oci-registry-name.tar.gz | Bin 0 -> 979 bytes test/e2e/testdata/oci-unnamed.tar.gz | Bin 0 -> 928 bytes test/e2e/testdata/registries.conf | 4 ++++ 11 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 test/e2e/testdata/docker-name-only.tar.xz create mode 100644 test/e2e/testdata/docker-registry-name.tar.xz create mode 100644 test/e2e/testdata/docker-two-images.tar.xz create mode 100644 test/e2e/testdata/docker-two-names.tar.xz create mode 100644 test/e2e/testdata/docker-unnamed.tar.xz delete mode 120000 test/e2e/testdata/image create mode 100644 test/e2e/testdata/oci-name-only.tar.gz create mode 100644 test/e2e/testdata/oci-non-docker-name.tar.gz create mode 100644 test/e2e/testdata/oci-registry-name.tar.gz create mode 100644 test/e2e/testdata/oci-unnamed.tar.gz create mode 100644 test/e2e/testdata/registries.conf (limited to 'test/e2e/testdata') diff --git a/test/e2e/testdata/docker-name-only.tar.xz b/test/e2e/testdata/docker-name-only.tar.xz new file mode 100644 index 000000000..0cad9f108 Binary files /dev/null and b/test/e2e/testdata/docker-name-only.tar.xz differ diff --git a/test/e2e/testdata/docker-registry-name.tar.xz b/test/e2e/testdata/docker-registry-name.tar.xz new file mode 100644 index 000000000..181816c2e Binary files /dev/null and b/test/e2e/testdata/docker-registry-name.tar.xz differ diff --git a/test/e2e/testdata/docker-two-images.tar.xz b/test/e2e/testdata/docker-two-images.tar.xz new file mode 100644 index 000000000..148d8a86b Binary files /dev/null and b/test/e2e/testdata/docker-two-images.tar.xz differ diff --git a/test/e2e/testdata/docker-two-names.tar.xz b/test/e2e/testdata/docker-two-names.tar.xz new file mode 100644 index 000000000..07fbc479c Binary files /dev/null and b/test/e2e/testdata/docker-two-names.tar.xz differ diff --git a/test/e2e/testdata/docker-unnamed.tar.xz b/test/e2e/testdata/docker-unnamed.tar.xz new file mode 100644 index 000000000..ba6ea1bae Binary files /dev/null and b/test/e2e/testdata/docker-unnamed.tar.xz differ diff --git a/test/e2e/testdata/image b/test/e2e/testdata/image deleted file mode 120000 index a9e67bf9a..000000000 --- a/test/e2e/testdata/image +++ /dev/null @@ -1 +0,0 @@ -../../../libpod/image/testdata/ \ No newline at end of file diff --git a/test/e2e/testdata/oci-name-only.tar.gz b/test/e2e/testdata/oci-name-only.tar.gz new file mode 100644 index 000000000..57bc07564 Binary files /dev/null and b/test/e2e/testdata/oci-name-only.tar.gz differ diff --git a/test/e2e/testdata/oci-non-docker-name.tar.gz b/test/e2e/testdata/oci-non-docker-name.tar.gz new file mode 100644 index 000000000..5ffc0eabd Binary files /dev/null and b/test/e2e/testdata/oci-non-docker-name.tar.gz differ diff --git a/test/e2e/testdata/oci-registry-name.tar.gz b/test/e2e/testdata/oci-registry-name.tar.gz new file mode 100644 index 000000000..e6df87339 Binary files /dev/null and b/test/e2e/testdata/oci-registry-name.tar.gz differ diff --git a/test/e2e/testdata/oci-unnamed.tar.gz b/test/e2e/testdata/oci-unnamed.tar.gz new file mode 100644 index 000000000..de445fdf8 Binary files /dev/null and b/test/e2e/testdata/oci-unnamed.tar.gz differ diff --git a/test/e2e/testdata/registries.conf b/test/e2e/testdata/registries.conf new file mode 100644 index 000000000..16622a1ac --- /dev/null +++ b/test/e2e/testdata/registries.conf @@ -0,0 +1,4 @@ +short-name-mode="enforcing" + +[aliases] +"busybox"="docker.io/library/busybox" -- cgit v1.2.3-54-g00ecf