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

updates to fedora-docker.conf

Browse Source 
- Update disk_size to 5 from 3 (from 30e6896)
- Add in Container minimal image build
- Fix references to f25 -> f26
- Fix references to f27 -> f26

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
This commit is contained in:
Dusty Mabe 2017-08-14 17:29:37 -04:00
parent bccea93e18
commit f6e7f6901b
No known key found for this signature in database
GPG Key ID: 3302DBD73952E671
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
fedora-docker.conf
View File

@ -27,7 +27,7 @@ runroot_channel = 'compose'
runroot_tag = 'f26-build'
# PKGSET
pkgset_source = 'koji' # koji, repos
pkgset_koji_tag = 'f25-updates'
pkgset_koji_tag = 'f26-updates'
pkgset_koji_inherit = True
filter_system_release_packages = False
# GATHER
@ -213,25 +213,52 @@ image_build = {
# correct SHA1 hash will be put into the URL below automatically
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',
'kickstart': 'fedora-docker-base.ks',
'distro': 'Fedora-20',
'disk_size': 3,
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['x86_64', 'armhfp'],
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
'repo': [
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
],
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
'subvariant': 'Docker_Base'
},
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f27container", "FGC=f27" ]',
'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
'docker_labels': {
'Name': 'fedora',
'License': u'MIT',
'Vendor': 'Fedora Project',
'Version': '27',
'Version': '26',
},
},
},
{
'image-build': {
'format': [('docker', 'tar.xz')],
'name': 'Fedora-Container-Minimal-Base',
'kickstart': 'fedora-docker-base-minimal.ks',
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['x86_64', 'armhfp'],
'install_tree_from': 'Everything',
'repo': [
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/',
],
'subvariant': 'Container_Minimal_Base',
},
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]',
'docker_labels': {
'Name': 'fedora-minimal',
'License': u'MIT',
'Vendor': 'Fedora Project',
'Version': '26',
},
},
}