opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-01 00:01:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix assumptions in 'push with --add-compression and --force-compression'

Browse Source 
When we want the original image to be gzip, explicitly ask for that
instead of assuming the containers.conf defaults do that.

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
This commit is contained in:
Miloslav Trmač
2024-02-08 21:19:41 +01:00
parent 8e99c697fc
commit 3e76e594b8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/manifest_test.go
View File

@ -197,7 +197,7 @@ var _ = Describe("Podman manifest", func() {
session.WaitWithDefaultTimeout() session.WaitWithDefaultTimeout()
Expect(session).Should(ExitCleanly()) Expect(session).Should(ExitCleanly())
push := podmanTest.Podman([]string{"manifest", "push", "--all", "--add-compression", "zstd", "--tls-verify=false", "--remove-signatures", "foobar", "localhost:5000/list"}) push := podmanTest.Podman([]string{"manifest", "push", "--all", "--compression-format", "gzip", "--add-compression", "zstd", "--tls-verify=false", "--remove-signatures", "foobar", "localhost:5000/list"})
push.WaitWithDefaultTimeout() push.WaitWithDefaultTimeout()
Expect(push).Should(Exit(0)) Expect(push).Should(Exit(0))
output := push.ErrorToString() output := push.ErrorToString()

2
test/system/012-manifest.bats
View File

@ -131,7 +131,7 @@ EOF
# Push to local registry; the magic key here is --add-compression... # Push to local registry; the magic key here is --add-compression...
local manifestpushed="localhost:${PODMAN_LOGIN_REGISTRY_PORT}/test:1.0" local manifestpushed="localhost:${PODMAN_LOGIN_REGISTRY_PORT}/test:1.0"
run_podman manifest push --authfile=$authfile --all --add-compression zstd --tls-verify=false $manifestlocal $manifestpushed run_podman manifest push --authfile=$authfile --all --compression-format gzip --add-compression zstd --tls-verify=false $manifestlocal $manifestpushed
# ...and use skopeo to confirm that each component has the right settings # ...and use skopeo to confirm that each component has the right settings
echo "$_LOG_PROMPT skopeo inspect ... $manifestpushed" echo "$_LOG_PROMPT skopeo inspect ... $manifestpushed"