PR#280: Configuration to build the docker base image, modular rawhide. - pungi-fedora

		`@@ -136,6 +136,51 @@`
		`'live': 'Live',`
		`}`

		`+ # https://pagure.io/fedora-kickstarts/pull-request/256`
		`+ global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#HEAD'`
		`+ global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'`
		`+ global_version = 'Rawhide'`
		`+ global_target = 'module-bootstrap-rawhide'`
		`+`
		`+ image_build = {`
		`+ '^Server$': [`
		`+ {`
		`+ 'image-build': {`
		`+ 'format': [('docker', 'tar.xz')],`
		`+ 'name': 'Fedora-Modular-Docker-Base',`
		`+ # https://pagure.io/fedora-kickstarts/pull-request/256`
		`+ 'kickstart': 'fedora-modular-docker-base-minimal.ks',`
		`+ 'distro': 'Fedora-27',`
		`+ 'disk_size': 3,`
		`+ 'arches': ['x86_64'],`
		`+ 'install_tree_from': 'Server',`
		`+ 'subvariant': 'Docker_Base',`
		`+ },`
		`+ 'factory-parameters': {`
		`+ 'dockerversion': '1.10.1',`
		`+ 'docker_cmd': '[ "/bin/bash" ]',`
		`+ 'docker_env': '[ "DISTTAG=f27container_modular", "FGC=f27-modular" ]',`
		`+ 'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "Version": "27-modular"}',`
		`+ },`
		`+ },`
		`+ {`
		`+ 'image-build': {`
		`+ 'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],`
		`+ 'name': 'Fedora-Modular-Server',`
		`+ # https://pagure.io/fedora-kickstarts/pull-request/259`
		`+ 'kickstart': 'fedora-modular-disk-minimal.ks',`
		`+ 'distro': 'Fedora-26',`
		`+ 'disk_size': 8,`
		`+ 'arches': ['x86_64'],`
		`+ 'repo': 'Server',`
		`+ 'install_tree_from': 'Server',`
		`+ 'subvariant': 'Server',`
		`+ 'failable': ['*'],`
		`+ }`
		`+ },`
		`+ ],`
		`+ }`
		`+`
		`translate_paths = [`
		`('/mnt/koji/compose/', 'http://kojipkgs.fedoraproject.org/compose/'),`
		`]`

ralph commented 6 years ago

Depends on these two being merged first:

Signed-off-by: Ralph Bean rbean@redhat.com

ralph commented 6 years ago

See also #282 for the f26 version of this PR.

1 new commit added

fix the docker_label entry to be a valid JSON string

6 years ago

psabata commented 6 years ago

Two things here:

use module-bootstrap-rawhide instead of f27-modularity
the docker label should probably include "modular" in the name or version to avoid conflicts with traditional base images

mohanboddu commented on line 28 of fedora-modular.conf 6 years ago

Can you change the dist tag to f27container_modular.

ralph commented on line 28 of fedora-modular.conf 6 years ago

Done!

1 new commit added

Fix version label and dist tag macro.

6 years ago

ralph commented 6 years ago

the docker label should probably include "modular" in the name or version to avoid conflicts with traditional base images

Done! Thanks.

use module-bootstrap-rawhide instead of f27-modularity

I'm going to sit on this one for the moment. Idealy, we can merge this, then submit a second PR that changes this runroot tag since it's not clear (at least to me) which tag we should really be using here.

3 new commits added

A target for modular images.
Add a qcow/raw image for modular rawhide.
Specify the correct variant in the image_build phase.

6 years ago

psabata commented 6 years ago

the docker label should probably include "modular" in the name or version to avoid conflicts with traditional base images

Done! Thanks.

use module-bootstrap-rawhide instead of f27-modularity

I'm going to sit on this one for the moment. Idealy, we can merge this, then submit a second PR that changes this runroot tag since it's not clear (at least to me) which tag we should really be using here.

Alright. Although f27-modularity has no content and PDC records for bootstrap:master point to module-bootstrap-rawhide. In either case, it would work -- the latter doesn't have a build group and doesn't use dnf as its package manager. So meh...