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

rename container config, set versions to 29

Browse Source 
subsitute Docker with Container

Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This commit is contained in:
Dennis Gilmore 2018-02-20 11:04:37 -06:00
parent c25886d520
commit 321f37c257
2 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
fedora-docker.conf → fedora-container.conf
View File

@ -1,11 +1,11 @@
# PRODUCT INFO # PRODUCT INFO
release_name = 'Fedora-Docker' release_name = 'Fedora-Container'
release_short = 'Fedora-Docker' release_short = 'Fedora-Container'
release_version = '26' release_version = '29'
release_is_layered = False release_is_layered = False
# GENERAL SETTINGS # GENERAL SETTINGS
bootable = False bootable = False
comps_file = 'comps-f26.xml' #{ comps_file = 'comps-f29.xml' #{
# 'scm': 'git', # 'scm': 'git',
# 'repo': 'git://git.fedorahosted.org/git/comps.git', # 'repo': 'git://git.fedorahosted.org/git/comps.git',
# 'branch': None, # defaults to cvs/HEAD or git/master # 'branch': None, # defaults to cvs/HEAD or git/master
@ -18,16 +18,16 @@ sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned
tree_arches = ['x86_64', 'armhfp'] tree_arches = ['x86_64', 'armhfp']
# limit tree variants # limit tree variants
# if undefined, all variants from variants.xml will be included # if undefined, all variants from variants.xml will be included
tree_variants = ['Docker'] tree_variants = ['Container']
hashed_directories = True hashed_directories = True
# RUNROOT settings # RUNROOT settings
runroot = True runroot = True
#runroot_channel = 'fedora_compose' #runroot_channel = 'fedora_compose'
runroot_channel = 'compose' runroot_channel = 'compose'
runroot_tag = 'f26-build' runroot_tag = 'f29-build'
# PKGSET # PKGSET
pkgset_source = 'koji' # koji, repos pkgset_source = 'koji' # koji, repos
pkgset_koji_tag = 'f26-updates' pkgset_koji_tag = 'f29-updates'
pkgset_koji_inherit = True pkgset_koji_inherit = True
filter_system_release_packages = False filter_system_release_packages = False
# GATHER # GATHER
@ -202,33 +202,33 @@ translate_paths = [
] ]
# These will be inherited by live_media, live_images and image_build # These will be inherited by live_media, live_images and image_build
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26' global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '26' global_version = '29'
global_target = 'f26' global_target = 'f29'
image_build = { image_build = {
'^Docker$': [ '^Container$': [
{ {
'image-build': { 'image-build': {
'format': [('docker', 'tar.xz')], 'format': [('docker', 'tar.xz')],
'name': 'Fedora-Docker-Base', 'name': 'Fedora-Container-Base',
'kickstart': 'fedora-docker-base.ks', 'kickstart': 'fedora-docker-base.ks',
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['x86_64', 'armhfp'], 'arches': ['x86_64', 'armhfp'],
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/', 'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/',
'repo': [ 'repo': [
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/', 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/29/$arch/',
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/', 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/',
], ],
'subvariant': 'Docker_Base' 'subvariant': 'Container_Base'
}, },
'factory-parameters': { 'factory-parameters': {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]', 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}', 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
}, },
}, },
@ -240,18 +240,18 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['x86_64', 'armhfp'], 'arches': ['x86_64', 'armhfp'],
'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/', 'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/',
'repo': [ 'repo': [
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/', 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/29/$arch/',
'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/26/Everything/$arch/os/', 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/',
], ],
'subvariant': 'Container_Minimal_Base', 'subvariant': 'Container_Minimal_Base',
}, },
'factory-parameters': { 'factory-parameters': {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]', 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}', 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
}, },
} }
], ],

8
fedora.conf
View File

@ -292,8 +292,8 @@ image_build = {
'factory-parameters': { 'factory-parameters': {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]', 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}', 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
}, },
}, },
{ {
@ -312,8 +312,8 @@ image_build = {
'factory-parameters': { 'factory-parameters': {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]', 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}', 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
}, },
} }
], ],