Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

deploy: Always use merge commit#556

Merged
cgwalters merged 1 commit intoostreedev:mainfrom
cgwalters:deploy-squashed
Oct 20, 2023
Merged

deploy: Always use merge commit#556
cgwalters merged 1 commit intoostreedev:mainfrom
cgwalters:deploy-squashed

Conversation

@cgwalters
Copy link
Member

I don't recall now the rationale for the previous code; if we're using this path we always want to be in a container-native mode. Currently the "unpack to pure ostree commit" gets triggered if one uses this on a container image created via raw ostree container encapsulate.

Anyone who wants the prior behavior should instead unencapsulate and deploy the underlying commit.

I don't recall now the rationale for the previous code; if
we're using this path we always want to be in a container-native
mode.  Currently the "unpack to pure ostree commit" gets triggered
if one uses this on a container image created via raw
`ostree container encapsulate`.

Anyone who wants the prior behavior should instead unencapsulate
and deploy the underlying commit.
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

Seems sane to me.

@cgwalters cgwalters merged commit 693c5eb into ostreedev:main Oct 20, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants