From: Shengjing Zhu Date: Tue, 4 Apr 2023 01:10:43 +0800 Subject: support ArgsEscaped in OCI image config Adapt golang-github-opencontainers-image-spec 1.1.0~rc2-2 which backports https://github.com/opencontainers/image-spec/commit/59780aa5 --- internal/image/fixtures/schema1-to-oci1-config.json | 1 + internal/image/fixtures/schema2-all-media-types-to-oci1.json | 4 ++-- internal/image/fixtures/schema2-to-oci1.json | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/internal/image/fixtures/schema1-to-oci1-config.json b/internal/image/fixtures/schema1-to-oci1-config.json index 84dc9db..fd3b763 100644 --- a/internal/image/fixtures/schema1-to-oci1-config.json +++ b/internal/image/fixtures/schema1-to-oci1-config.json @@ -10,6 +10,7 @@ "KOLLA_INSTALL_METATYPE=rhos", "PS1=$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(hostname -s) $(pwd)]$ " ], + "ArgsEscaped": true, "Cmd": [ "kolla_start" ], diff --git a/internal/image/fixtures/schema2-all-media-types-to-oci1.json b/internal/image/fixtures/schema2-all-media-types-to-oci1.json index 8287c48..65fff4a 100644 --- a/internal/image/fixtures/schema2-all-media-types-to-oci1.json +++ b/internal/image/fixtures/schema2-all-media-types-to-oci1.json @@ -3,8 +3,8 @@ "mediaType": "application/vnd.oci.image.manifest.v1+json", "config": { "mediaType": "application/vnd.oci.image.config.v1+json", - "size": 4651, - "digest": "sha256:a13a0762ab7bed51a1b49adec0a702b1cd99294fd460a025b465bcfb7b152745" + "size": 4670, + "digest": "sha256:f15ba60ec257ee2cf4fddfb9451bb86ba2668450e88d402f5ecc7ea6ce1b661a" }, "layers": [ { diff --git a/internal/image/fixtures/schema2-to-oci1.json b/internal/image/fixtures/schema2-to-oci1.json index 01dfda5..251e4e5 100644 --- a/internal/image/fixtures/schema2-to-oci1.json +++ b/internal/image/fixtures/schema2-to-oci1.json @@ -3,8 +3,8 @@ "mediaType": "application/vnd.oci.image.manifest.v1+json", "config": { "mediaType": "application/vnd.oci.image.config.v1+json", - "size": 4651, - "digest": "sha256:a13a0762ab7bed51a1b49adec0a702b1cd99294fd460a025b465bcfb7b152745" + "size": 4670, + "digest": "sha256:f15ba60ec257ee2cf4fddfb9451bb86ba2668450e88d402f5ecc7ea6ce1b661a" }, "layers": [{ "mediaType": "application/vnd.oci.image.layer.v1.tar+gzip",