From 519b1b3290ae4c17956cf5c0c7290a90c939bb7d Mon Sep 17 00:00:00 2001 From: Brian Stinson Date: Sep 27 2019 17:06:50 +0000 Subject: move container into its own compose --- diff --git a/container.conf b/container.conf new file mode 100644 index 0000000..fe1ef92 --- /dev/null +++ b/container.conf @@ -0,0 +1,100 @@ +from multilib import * +from include-excludes import * + +release_name = 'CentOS-Container' +release_short = 'CentOS-Container' +release_version = '8' +release_is_layered = False + +skip_phases = ['buildinstall','productimg','pkgset','gather','extra_files','createrepo'] + + +variants_file = 'variants.xml' +sigkeys = ['8483C65D'] +hashed_directories = False + +tree_arches = ['i386', 'x86_64'] +tree_variants = ['Cloud'] + +# PKGSET +pkgset_source = "koji" +koji_profile = "mbox" + +# PKGSET - KOJI +pkgset_koji_tag = "dist-c8-compose" +pkgset_koji_inherit = False +pkgset_koji_module_tag = "modular-updates-candidate" + +# GATHER +gather_prepopulate = "centos-packages.json" + +gather_method = { + "^(?!(AppStream|PowerTools)).*$":{ + "comps": "deps" + }, + "^(AppStream|PowerTools)$": "hybrid", +} + +# CREATEREPO +createrepo_deltas = False +createrepo_database = True +createrepo_c = True +createrepo_checksum = "sha256" +createrepo_use_xz = True +createrepo_num_threads = 8 +createrepo_num_workers = 4 +createrepo_extra_args = ['--distro=cpe:/o:centos:centos:8,CentOS 8', '--revision=8.0.1905'] + +# CHECKSUMS +media_checksums = ['sha256'] +media_checksum_one_file = True +create_jigdo = False + +createiso_skip = [ + ('^BaseOS$', { + '*': True, + 'src': True + }), + ('^AppStream$', { + '*': True, + 'src': True + }), + ('^PowerTools$', { + '*': True, + 'src': True + }), +] + +image_build = { + "^Cloud$": [ + { + "image-build": { + "format": [("docker", "tar.gz")], + "name": "CentOS-8-Container", + "target": "image-centos-8", + "version": "8.0.1905", + "ksurl": "git+https://git.centos.org/CentOS/kickstarts.git?#HEAD", + "kickstart": "CentOS-8-Container.ks", + "ksversion": "F26", + "distro": "Fedora-20", + "disk-size": "10", + "arches": ["x86_64","ppc64le","aarch64"], + "repo": [ + 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', + ], + "install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', + "failable": ["ppc64le","aarch64"], + }, + "factory-parameters": { + "generate_icicle": False, + "docker_cmd": '[ "/bin/bash" ]', + "docker_label": '{ "name": "centos", "license": "GPLv2", "vendor": "The CentOS Project", "version": "8.0.1905"}', + } + } + ] +} + +translate_paths = [ + ("/mnt/koji", "https://koji.mbox.centos.org/pkgs"), + ("/compose", "http://172.22.0.123/compose"), +] diff --git a/images.conf b/images.conf index 361f1b2..c9b5ff6 100644 --- a/images.conf +++ b/images.conf @@ -35,9 +35,7 @@ gather_method = { "^(AppStream|PowerTools)$": "hybrid", } -# CREATEREPO -createrepo_deltas = False -createrepo_database = True +# CREATEREPO createrepo_deltas = False createrepo_database = True createrepo_c = True createrepo_checksum = "sha256" createrepo_use_xz = True @@ -111,30 +109,6 @@ image_build = { "generate_icicle": False, } }, - { - "image-build": { - "format": [("docker", "tar.gz")], - "name": "CentOS-8-Container", - "target": "image-centos-8", - "version": "8.0.1905", - "ksurl": "git+https://git.centos.org/CentOS/kickstarts.git?#HEAD", - "kickstart": "CentOS-8-Container.ks", - "ksversion": "F26", - "distro": "Fedora-20", - "disk-size": "10", - "arches": ["x86_64","ppc64le","aarch64"], - "repo": [ - 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', - ], - "install_tree_from": 'http://mirror.centos.org/centos/8.0.1905/BaseOS/$arch/kickstart', - "failable": ["ppc64le","aarch64"], - }, - "factory-parameters": { - "generate_icicle": False, - "docker_cmd": '[ "/bin/bash" ]', - "docker_label": '{ "name": "centos", "license": "GPLv2", "vendor": "The CentOS Project", "version": "8.0.1905"}', - } - } ] }