#303 f29: Update container-management again
Merged 5 years ago by dustymabe. Opened 5 years ago by walters.
walters/fedora-comps flatpak-builder  into  master

f29: Update container-management again
Colin Walters • 5 years ago  
file modified
+6 -3
@@ -708,12 +708,15 @@ 

      <default>false</default>

      <uservisible>true</uservisible>

      <packagelist>

-       <packagereq type="mandatory">atomic</packagereq>

-       <packagereq type="conditional" requires="cockpit">cockpit-docker</packagereq>

-       <packagereq type="default">docker</packagereq>

+       <packagereq type="default">podman</packagereq>

+       <packagereq type="optional">docker</packagereq>

+       <packagereq type="optional">cockpit-docker</packagereq>

+       <packagereq type="optional">atomic</packagereq>

        <packagereq type="optional">buildah</packagereq>

        <packagereq type="optional">origin-clients</packagereq>

        <packagereq type="optional">podman</packagereq>

+       <packagereq type="optional">flatpak</packagereq>

+       <packagereq type="optional">flatpak-builder</packagereq>

      </packagelist>

    </group>

    <group>

We need flatpak-builder for Silverblue. For the others...let's
make podman default since that's where the containers team emphasis
is, and everything else optional.

Can someone merge this please?

looks like I can merge. mind rebasing and I'll do that

rebased onto 3c4eaf7

5 years ago

Pull-Request has been merged by dustymabe

5 years ago
Metadata