From 857fbfe4f4ef6c48247c6542b429102df27f126c Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Jun 10 2022 17:05:02 +0000 Subject: Restore ELN container image builds Signed-off-by: Stephen Gallagher --- diff --git a/fedora/override.conf b/fedora/override.conf index b830250..96b3b10 100644 --- a/fedora/override.conf +++ b/fedora/override.conf @@ -98,13 +98,33 @@ image_build = { "disk-size": "10", "arches": ["x86_64"], 'install_tree_from': 'BaseOS', - "repo": ["BaseOS","AppStream","CRB"] + "repo": ["BaseOS","AppStream","CRB"], "failable": ["*"], }, "factory-parameters": { "generate_icicle": False, } - } - ] + }, + { + 'image-build': { + 'format': [('docker', 'tar.xz')], + 'name': 'Fedora-Container-Base', + 'kickstart': 'fedora-eln-container-base.ks', + 'distro': 'Fedora-22', + 'disk_size': 10, + 'repo': ["BaseOS","AppStream","CRB"], + 'install_tree_from': 'Everything', + 'subvariant': 'Container_Base', + 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], + 'failable': ['*'], + }, + 'factory-parameters': { + 'dockerversion': "1.10.1", + 'docker_cmd': '[ "/bin/bash" ]', + 'docker_env': '[ "DISTTAG=elncontainer", "FGC=eln", "container=oci" ]', + 'docker_label': '{ "name": "fedora-eln", "license": "MIT", "vendor": "Fedora Project", "version": "eln"}', + }, + }, + ], }