From 321f37c257df9920d375262d71d41c11cd897d0b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 20 Feb 2018 11:04:37 -0600 Subject: [PATCH] rename container config, set versions to 29 subsitute Docker with Container Signed-off-by: Dennis Gilmore --- fedora-docker.conf => fedora-container.conf | 46 ++++++++++----------- fedora.conf | 8 ++-- 2 files changed, 27 insertions(+), 27 deletions(-) rename fedora-docker.conf => fedora-container.conf (88%) diff --git a/fedora-docker.conf b/fedora-container.conf similarity index 88% rename from fedora-docker.conf rename to fedora-container.conf index afcecf6..7451ff3 100644 --- a/fedora-docker.conf +++ b/fedora-container.conf @@ -1,11 +1,11 @@ # PRODUCT INFO -release_name = 'Fedora-Docker' -release_short = 'Fedora-Docker' -release_version = '26' +release_name = 'Fedora-Container' +release_short = 'Fedora-Container' +release_version = '29' release_is_layered = False # GENERAL SETTINGS bootable = False -comps_file = 'comps-f26.xml' #{ +comps_file = 'comps-f29.xml' #{ # 'scm': 'git', # 'repo': 'git://git.fedorahosted.org/git/comps.git', # 'branch': None, # defaults to cvs/HEAD or git/master @@ -18,16 +18,16 @@ sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned tree_arches = ['x86_64', 'armhfp'] # limit tree variants # if undefined, all variants from variants.xml will be included -tree_variants = ['Docker'] +tree_variants = ['Container'] hashed_directories = True # RUNROOT settings runroot = True #runroot_channel = 'fedora_compose' runroot_channel = 'compose' -runroot_tag = 'f26-build' +runroot_tag = 'f29-build' # PKGSET pkgset_source = 'koji' # koji, repos -pkgset_koji_tag = 'f26-updates' +pkgset_koji_tag = 'f29-updates' pkgset_koji_inherit = True filter_system_release_packages = False # GATHER @@ -202,33 +202,33 @@ translate_paths = [ ] # 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_version = '26' -global_target = 'f26' +global_version = '29' +global_target = 'f29' image_build = { - '^Docker$': [ + '^Container$': [ { 'image-build': { 'format': [('docker', 'tar.xz')], - 'name': 'Fedora-Docker-Base', + 'name': 'Fedora-Container-Base', 'kickstart': 'fedora-docker-base.ks', '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/', + 'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/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/', + 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/29/$arch/', + 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/', ], - 'subvariant': 'Docker_Base' + 'subvariant': 'Container_Base' }, 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}', + 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', }, }, @@ -240,18 +240,18 @@ image_build = { '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/', + 'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/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/', + 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/29/$arch/', + 'http://kojipkgs.fedoraproject.org/pub/fedora/linux/releases/29/Everything/$arch/os/', ], 'subvariant': 'Container_Minimal_Base', }, 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f26container", "FGC=f26" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "26"}', + 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', }, } ], diff --git a/fedora.conf b/fedora.conf index 3857786..7eebaee 100644 --- a/fedora.conf +++ b/fedora.conf @@ -292,8 +292,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}', + 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', }, }, { @@ -312,8 +312,8 @@ image_build = { 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f28container", "FGC=f28" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "28"}', + 'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}', }, } ],