Update container config
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
This commit is contained in:
parent
6fcacec0f2
commit
375c1fe320
|
@ -1,7 +1,7 @@
|
|||
# PRODUCT INFO
|
||||
release_name = 'Fedora-Container'
|
||||
release_short = 'Fedora-Container'
|
||||
release_version = '35'
|
||||
release_version = '37'
|
||||
release_is_layered = False
|
||||
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
|
||||
# GENERAL SETTINGS
|
||||
|
@ -10,8 +10,8 @@ comps_file = {
|
|||
'scm': 'git',
|
||||
'repo': 'https://pagure.io/fedora-comps.git',
|
||||
'branch': 'main',
|
||||
'file': 'comps-f35.xml',
|
||||
'command': 'make comps-f35.xml'
|
||||
'file': 'comps-f37.xml',
|
||||
'command': 'make comps-f37.xml'
|
||||
}
|
||||
variants_file='variants-fedora.xml'
|
||||
sigkeys = ['5323552A'] # None = unsigned
|
||||
|
@ -26,10 +26,10 @@ hashed_directories = True
|
|||
runroot = True
|
||||
#runroot_channel = 'fedora_compose'
|
||||
runroot_channel = 'compose'
|
||||
runroot_tag = 'f35-build'
|
||||
runroot_tag = 'f37-build'
|
||||
# PKGSET
|
||||
pkgset_source = 'koji' # koji, repos
|
||||
pkgset_koji_tag = 'f35-updates'
|
||||
pkgset_koji_tag = 'f37-updates'
|
||||
pkgset_koji_inherit = True
|
||||
filter_system_release_packages = False
|
||||
# GATHER
|
||||
|
@ -214,10 +214,10 @@ translate_paths = [
|
|||
]
|
||||
|
||||
# These will be inherited by live_media, live_images and image_build
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35'
|
||||
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f37'
|
||||
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
|
||||
global_version = '35'
|
||||
global_target = 'f35'
|
||||
global_version = '37'
|
||||
global_target = 'f37'
|
||||
|
||||
image_build = {
|
||||
'^Container$': [
|
||||
|
@ -229,18 +229,18 @@ image_build = {
|
|||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/',
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/'
|
||||
],
|
||||
'subvariant': 'Container_Base'
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}',
|
||||
'docker_env': '[ "DISTTAG=f37container", "FGC=f37", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "37"}',
|
||||
},
|
||||
},
|
||||
{
|
||||
|
@ -251,18 +251,18 @@ image_build = {
|
|||
'distro': 'Fedora-22',
|
||||
'disk_size': 5,
|
||||
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/',
|
||||
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/',
|
||||
'repo': [
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/updates/f37-updates/compose/Everything/$arch/os/'
|
||||
'https://kojipkgs.fedoraproject.org/compose/37/latest-Fedora-37/compose/Everything/$arch/os/'
|
||||
],
|
||||
'subvariant': 'Container_Minimal_Base',
|
||||
},
|
||||
'factory-parameters': {
|
||||
'dockerversion': "1.10.1",
|
||||
'docker_cmd': '[ "/bin/bash" ]',
|
||||
'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}',
|
||||
'docker_env': '[ "DISTTAG=f37container", "FGC=f37", "container=oci" ]',
|
||||
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "37"}',
|
||||
},
|
||||
}
|
||||
],
|
||||
|
|
Loading…
Reference in New Issue