davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modular compoase fixups

Browse Source 
set the distags in containers correctly
build images for more arches
Rename Docker to Container
build minimal and base container images

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2017-09-27 09:54:03 -05:00
parent 968f8fdf52
commit 33e77931e7
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
fedora-modular.conf
View File

@ -151,20 +151,37 @@ image_build = {
{
'image-build': {
'format': [('docker', 'tar.xz')],
'name': 'Fedora-Modular-Docker-Base',
# https://pagure.io/fedora-kickstarts/pull-request/257
'kickstart': 'fedora-modular-docker-base-minimal.ks',
'distro': 'Fedora-27',
'name': 'Fedora-Modular-Container-Base',
'kickstart': 'fedora-modular-container-base.ks',
'distro': 'Fedora-28',
'disk_size': 4,
'arches': ['x86_64'],
'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'],
'install_tree_from': 'Server',
'subvariant': 'Docker_Base',
'subvariant': 'Container_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"}',
'docker_env': '[ "DISTTAG=f28container_modular", "FGC=f28-modular" ]',
'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28-modular"}',
},
},
{
'image-build': {
'format': [('docker', 'tar.xz')],
'name': 'Fedora-Modular-Container-Minimal',
'kickstart': 'fedora-modular-container-base-minimal.ks',
'distro': 'Fedora-28',
'disk_size': 4,
'arches': ['aarch64', 'armhfp', 'ppc64le', 'x86_64'],
'install_tree_from': 'Server',
'subvariant': 'Container_Base',
},
'factory-parameters': {
'dockerversion': '1.10.1',
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f28container_modular", "FGC=f28-modular" ]',
'docker_label': '{"name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28-modular"}',
},
},
{
@ -172,9 +189,9 @@ image_build = {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
'name': 'Fedora-Modular-Server',
'kickstart': 'fedora-modular-disk-minimal.ks',
'distro': 'Fedora-27',
'distro': 'Fedora-28',
'disk_size': 8,
'arches': ['x86_64'],
'arches': ['aarch64', 'ppc64le', 'x86_64'],
'repo': 'Server',
'install_tree_from': 'Server',
'subvariant': 'Server',