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

OCI: Only use labels, never annotations #3294

Merged
merged 1 commit into from Dec 16, 2019

Conversation

alexlarsson
Copy link
Member

This is a slightly incompatible change, as we now only support
oci images generated with (what was before) build-export --oci-use-labels.
However, there are not a lot of OCI implementations in the wild, and
we can modify the ones in use to ensure there are labels (and
annotations if needed for older flatpak clients).

This also removes the --oci-use-label option from build-bundle --oci as
this is now the default.

@alexlarsson
Copy link
Member Author

@owtaylor If this is merged, it will break current fedora repos:

flatpak remote-ls -vv --user fedora
F: Opening user flatpak installation at path /home/alex/.local/share/flatpak
F: Loading https://registry.fedoraproject.org/index/static?label%3Aorg.flatpak.ref%3Aexists=1&architecture=amd64&os=linux&tag=latest using libsoup
error: Server returned status 404: Not Found

Do you plan to convert fedora to use labels?

@owtaylor
Copy link
Contributor

We haven't yet done the work (update infrastructure, rebuild all the containers - the modules don't need rebuilds) to get Fedora Flatpaks to be dual labels/annotations, but it's straightforward. My preference would not to block landing this on that, but perhaps block wait on updating Fedora to a new Flatpak release for a week or two if necessary.

cc: @kalev @amigadave

@owtaylor
Copy link
Contributor

Filed https://pagure.io/fedora-infrastructure/issue/8464 for the infrastructure update

This is a slightly incompatible change, as we now only support
oci images generated with (what was before) build-export --oci-use-labels.
However, there are not a lot of OCI implementations in the wild, and
we can modify the ones in use to ensure there are labels (and
annotations if needed for older flatpak clients).

This also removes the --oci-use-label option from build-bundle --oci as
this is now the default.
@alexlarsson
Copy link
Member Author

I'm gonna merge this now, and then fedora can delay the eventual 1.6 update (once released) until the infra is changed.

@mkrajnak
Copy link

@kalev @owtaylor is there some issue or a bug where this is tracked ? Both this issue and the pagure issue are closed but OCI remotes still returns 404.

@kalev
Copy link
Contributor

kalev commented Jan 29, 2020

@mkrajnak We need to do https://pagure.io/fedora-infrastructure/issue/8579 on the Fedora infra side to get this working with flatpak 1.6

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants