#59 Split desktop-base from "atomic" + add git-core,buildah
Merged 6 years ago by walters. Opened 6 years ago by walters.
walters/workstation-ostree-config workstation-cleanup  into  master

atomic: Add git-core and buildah
Colin Walters • 6 years ago  
Split workstation-base from "atomic"
Colin Walters • 6 years ago  
@@ -0,0 +1,17 @@ 

+ {

+     "ref": "fedora/rawhide/x86_64/workstation",

+ 

+     "include": "fedora-workstation-base.json",

+ 

+     "automatic_version_prefix": "28",

+     "mutate-os-release": "28",

+ 

+     "packages": [

+         "atomic",

+         "buildah",

+         "git-core",

+         "rpm-ostree",

+         "skopeo",

+         "docker"

+     ]

+ }

@@ -0,0 +1,1 @@ 

+ fedora-atomic-workstation.json 

\ No newline at end of file

fedora-workstation-base.json fedora-ostree-workstation.json
file renamed
+3 -14
@@ -1,26 +1,19 @@ 

  {

-     "ref": "fedora/rawhide/x86_64/workstation",

- 

+     "ref": "fedora/rawhide/x86_64/workstation-base",

      "repos": ["fedora-rawhide"],

  

      "selinux": true,

- 

      "documentation": true,

- 

-     "automatic_version_prefix": "28",

-     "mutate-os-release": "28",

- 

      "boot_location": "new",

- 

      "etc-group-members": ["wheel"],

  

+     "postprocess-script": "post.sh",

+ 

      "ignore-removed-users": ["root"],

      "ignore-removed-groups": ["root"],

      "check-passwd": { "type": "file", "filename": "passwd" },

      "check-groups": { "type": "file", "filename": "group" },

  

-     "postprocess-script": "post.sh",

- 

      "packages": [

  		"aajohan-comfortaa-fonts",

  		"adobe-source-han-sans-cn-fonts",
@@ -32,7 +25,6 @@ 

  		"atmel-firmware",

  		"at-spi2-atk",

  		"at-spi2-core",

- 		"atomic",

  		"attr",

  		"audit",

  		"authconfig",
@@ -73,7 +65,6 @@ 

  		"dmidecode",

  		"dmraid",

  		"dmraid-events",

- 		"docker",

  		"dos2unix",

  		"dracut-config-generic",

  		"dracut-network",
@@ -324,8 +315,6 @@ 

  		"rdist",

  		"rng-tools",

  		"rootfiles",

- 		"rpm",

- 		"rpm-ostree",

  		"rp-pppoe",

  		"rsync",

  		"rygel",

This seems reasonable to me. If we are going all in on container tools like this, does it make sense to also include origin-clients? Or do we draw the line there? (It does pull in a mess of Perl packages, so I can understand leaving it out)

is this ref ever intended to be used? If not I think giving it a semi-legitimate name will be confusing.

Is this package list machine 'generated' somehow?

what about calling the new file fedora-workstation-base.json and renaming this one to fedora-atomic-workstation.json? I've already started working towards renaming WorkstationOstree to AtomicWorkstation in the pungi configs: https://pagure.io/pungi-fedora/pull-request/498

@miabbott
does it make sense to also include origin-clients

I'd prefer not to push that on people right now. I think there is a fair # of people who will be using atomic workstation who won't be using openshift.

@walters, will this build in rawhide like it is? I know I had done some looking at what was missing in workstation comps and think we had to add some stuff there.

IOW, does this commit help solve that? Or will that work still need to be done, which I suspect is the case.

I'd prefer not to push that on people right now. I think there is a fair # of people who will be using atomic workstation who won't be using openshift.

The other problem is it's ridiculously huge (250MB). But we can address that in other ways.

@walters, will this build in rawhide like it is?

We won't have to worry about "comps filtering" after https://pagure.io/pungi/pull-request/842 right?

Is this package list machine 'generated' somehow?

Not yet but this is a step towards that; we can write a script which runs through comps and writes this json, optionally removing some bits.

what about calling the new file fedora-workstation-base.json and renaming this one to fedora-atomic-workstation.json? I

Sure.

We won't have to worry about "comps filtering" after https://pagure.io/pungi/pull-request/842 right?

I guess you're right, /me wonders how long before that hits prod.

Did you see my other two questions?

rebased onto 41ead6e4de7e43d810a459d0298d806b4f8fab24

6 years ago

We don't get notifications when a rebase happens so I didn't realize you had actually responded to my question. This looks good. I'll need to make sure to update the pungi configs.

The only final question I have is. Did you mean to delete the hyperv* packages as is shown in the file diff?

rebased onto aeb77c061d71e26103d83c43705468274ee92743

6 years ago

Did you mean to delete the hyperv* packages as is shown in the file diff?

Not yet...but I plan to do that soon. Rebased :surfer:

This is missing the fedora-ostree-workstation.json compat symlink, no?

rebased onto e08b908

6 years ago

Good catch! Lost that when rebasing apparently. Fixed.

This is missing the fedora-ostree-workstation.json compat symlink, no?

Do we really need that if we update pungi too?

Do we really need that if we update pungi too?

I think it's simpler to carry the symlink for a while. It's just not a big maintenance burden.

I'll merge this in an hour unless anyone has any objections

Pull-Request has been merged by walters

6 years ago