From 6ad98db4deec32e9fe3ccc5dabb2eedd6efb8b6e Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Fri, 30 Jul 2021 10:15:25 +0200 Subject: [PATCH 1/5] bump to v5.14.1-dev Signed-off-by: Valentin Rothberg --- version/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version/version.go b/version/version.go index 0a19715359..a4bdb058ea 100644 --- a/version/version.go +++ b/version/version.go @@ -8,10 +8,10 @@ const ( // VersionMinor is for functionality in a backwards-compatible manner VersionMinor = 14 // VersionPatch is for backwards-compatible bug fixes - VersionPatch = 0 + VersionPatch = 1 // VersionDev indicates development branch. Releases will be empty string. - VersionDev = "" + VersionDev = "-dev" ) // Version is the specification version that the package types support. From c0b4d485465e46a16c2df3e424b02cffb3231edf Mon Sep 17 00:00:00 2001 From: Silvio Moioli Date: Thu, 17 Jun 2021 15:53:12 +0200 Subject: [PATCH 2/5] Add support for decompressing while copying to dir:// Signed-off-by: Silvio Moioli --- directory/directory_dest.go | 12 ++++++++---- directory/directory_transport.go | 6 +++++- types/types.go | 2 ++ 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/directory/directory_dest.go b/directory/directory_dest.go index 49957ac4e1..6758d56531 100644 --- a/directory/directory_dest.go +++ b/directory/directory_dest.go @@ -21,13 +21,14 @@ const version = "Directory Transport Version: 1.1\n" var ErrNotContainerImageDir = errors.New("not a containers image directory, don't want to overwrite important data") type dirImageDestination struct { - ref dirReference - compress bool + ref dirReference + compress bool + decompress bool } // newImageDestination returns an ImageDestination for writing to a directory. -func newImageDestination(ref dirReference, compress bool) (types.ImageDestination, error) { - d := &dirImageDestination{ref: ref, compress: compress} +func newImageDestination(ref dirReference, compress bool, decompress bool) (types.ImageDestination, error) { + d := &dirImageDestination{ref: ref, compress: compress, decompress: decompress} // If directory exists check if it is empty // if not empty, check whether the contents match that of a container image directory and overwrite the contents @@ -104,6 +105,9 @@ func (d *dirImageDestination) DesiredLayerCompression() types.LayerCompression { if d.compress { return types.Compress } + if d.decompress { + return types.Decompress + } return types.PreserveOriginal } diff --git a/directory/directory_transport.go b/directory/directory_transport.go index adfec6ef37..c529c7bdbd 100644 --- a/directory/directory_transport.go +++ b/directory/directory_transport.go @@ -157,7 +157,11 @@ func (ref dirReference) NewImageDestination(ctx context.Context, sys *types.Syst if sys != nil { compress = sys.DirForceCompress } - return newImageDestination(ref, compress) + decompress := false + if sys != nil { + decompress = sys.DirForceDecompress + } + return newImageDestination(ref, compress, decompress) } // DeleteImage deletes the named image from the registry, if supported. diff --git a/types/types.go b/types/types.go index 48efa195be..1c4a1419fe 100644 --- a/types/types.go +++ b/types/types.go @@ -636,6 +636,8 @@ type SystemContext struct { // === dir.Transport overrides === // DirForceCompress compresses the image layers if set to true DirForceCompress bool + // DirForceDecompress decompresses the image layers if set to true + DirForceDecompress bool // CompressionFormat is the format to use for the compression of the blobs CompressionFormat *compression.Algorithm From 002b59f04d87a63a87035c0532bc54f49f83e089 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Fri, 30 Jul 2021 10:14:13 +0200 Subject: [PATCH 3/5] v5.14.1 * Add support for decompressing while copying to dir:// Signed-off-by: Valentin Rothberg --- version/version.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version/version.go b/version/version.go index a4bdb058ea..95f1150204 100644 --- a/version/version.go +++ b/version/version.go @@ -11,7 +11,7 @@ const ( VersionPatch = 1 // VersionDev indicates development branch. Releases will be empty string. - VersionDev = "-dev" + VersionDev = "" ) // Version is the specification version that the package types support. From 0b55e35bf6276668cd4d722182e6250d86d83bc1 Mon Sep 17 00:00:00 2001 From: Valentin Rothberg Date: Fri, 30 Jul 2021 10:14:50 +0200 Subject: [PATCH 4/5] bump to v5.14.2-dev Signed-off-by: Valentin Rothberg --- version/version.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version/version.go b/version/version.go index 95f1150204..2ef195af02 100644 --- a/version/version.go +++ b/version/version.go @@ -8,10 +8,10 @@ const ( // VersionMinor is for functionality in a backwards-compatible manner VersionMinor = 14 // VersionPatch is for backwards-compatible bug fixes - VersionPatch = 1 + VersionPatch = 2 // VersionDev indicates development branch. Releases will be empty string. - VersionDev = "" + VersionDev = "-dev" ) // Version is the specification version that the package types support. From 3cbfefdfa735f27d227f2c35ee90fa60816469eb Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Fri, 23 Jul 2021 09:59:37 -0400 Subject: [PATCH 5/5] Cirrus: Sync. skopeo test to skopeo repo. Signed-off-by: Chris Evich --- .cirrus.yml | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 494dcaa622..a0d8caf8fd 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -101,26 +101,22 @@ test_task: BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove' - name: "Test w/ opengpg" env: - BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp' + BUILDTAGS: &withopengpg 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp' script: | make tools make test BUILDTAGS="$BUILDTAGS" ##### -###### NOTE: This task is subtantially duplicated in the containers/skopeo -###### repository's `.cirrus.yml`. Changes needed here should first be -###### merged in that repository, before being manually duplicated here. -###### -###### The *ONLY* exception is in "setup_script" which must initially -###### clone the skopeo repository. -###### +##### NOTE: This task is subtantially duplicated in the containers/skopeo +##### repository's `.cirrus.yml`. Changes made here should be fully merged +##### prior to being manually duplicated and maintained in containers/skopeo. +##### test_skopeo_task: alias: test_skopeo + only_if: *not_docs depends_on: - validate - - cross - only_if: *not_docs gce_instance: image_project: libpod-218412 zone: "us-central1-f" @@ -131,25 +127,23 @@ test_skopeo_task: disk: 200 image_name: ${FEDORA_CACHE_IMAGE_NAME} matrix: - - name: "Skopeo" + - name: "Skopeo Test" env: BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove' - - name: "Skopeo w/ opengpg" + - name: "Skopeo Test w/ opengpg" env: - BUILDTAGS: 'btrfs_noversion libdm_no_deferred_remove containers_image_openpgp' - setup_script: | + BUILDTAGS: *withopengpg + setup_script: >- "${GOSRC}/${SCRIPT_BASE}/runner.sh" setup vendor_script: >- "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" vendor build_script: >- "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" build - validate_script: >- - "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" validate unit_script: >- "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" unit integration_script: >- "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" integration - system_script: >- + system_script: > "${SKOPEO_PATH}/${SCRIPT_BASE}/runner.sh" system