Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reverse the order of extraction of layers #625

Merged
merged 2 commits into from
Feb 6, 2024

Conversation

joaopapereira
Copy link
Member

@joaopapereira joaopapereira commented Jan 8, 2024

Fixes #441

@alexbarbato
Copy link
Contributor

Any chance anyone has had to look at this?

func inWhiteoutDir(fileMap map[string]bool, file string) bool {
for {
if file == "" {
break
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return false?

pkg/imgpkg/image/dir_image.go Show resolved Hide resolved
}
dirname := filepath.Dir(file)
if file == dirname {
break
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

return false?

pkg/imgpkg/image/dir_image.go Show resolved Hide resolved
@@ -41,8 +41,8 @@ images:
kbld.carvel.dev/id: cloudfoundry/syslog-server@sha256:bb1aa0d603eff716245f25c832ad9b9bca569059f48bd2b5a9a792486f453427
image: index.docker.io/cloudfoundry/syslog-server@sha256:bb1aa0d603eff716245f25c832ad9b9bca569059f48bd2b5a9a792486f453427
- annotations:
kbld.carvel.dev/id: gcr.io/paketo-community/python@sha256:5fc81b8f38f326f0247468c14b4eb66b36e5f925db12f9ea8df1ec57f9e61d94
image: gcr.io/paketo-community/python@sha256:5fc81b8f38f326f0247468c14b4eb66b36e5f925db12f9ea8df1ec57f9e61d94
kbld.carvel.dev/id: index.docker.io/paketocommunity/python/python@sha256:1228cfb8003f830b178b9b8a227889cae32df1aed74a746f2ac59b6bb8e88961
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to merge this in a separate PR first because we might want to cherry pick this to some other branches too.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was expecting this to be merged soon so I just added as part of this PR

Signed-off-by: Joao Pereira <joaod@vmware.com>
Signed-off-by: Joao Pereira <joaod@vmware.com>
@joaopapereira joaopapereira merged commit 5625c88 into develop Feb 6, 2024
7 checks passed
@joaopapereira joaopapereira deleted the reverse-extraction-order branch February 6, 2024 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

imgpkg fails to pull images built using ko
3 participants