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

Merge #305 rename the Docker Variant and images to Container

Browse Source
This commit is contained in:
Dennis Gilmore 2018-02-15 18:02:48 +00:00
commit 4322a5c35d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fedora.conf
View File

@ -277,18 +277,18 @@ global_version = 'Rawhide'
global_target = 'f28' global_target = 'f28'
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': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'], 'arches': ['armhfp', 'aarch64', 'ppc64le', 'x86_64'],
'repo': 'Everything', 'repo': 'Everything',
'install_tree_from': 'Everything', 'install_tree_from': 'Everything',
'subvariant': 'Docker_Base', 'subvariant': 'Container_Base',
'failable': ['*'], 'failable': ['*'],
}, },
'factory-parameters': { 'factory-parameters': {

2
variants-fedora.xml
View File

@ -17,7 +17,7 @@
<arch>x86_64</arch> <arch>x86_64</arch>
</arches> </arches>
</variant> </variant>
<variant id="Docker" name="Docker" type="variant" is_empty="true"> <variant id="Container" name="Container" type="variant" is_empty="true">
<arches> <arches>
<arch>aarch64</arch> <arch>aarch64</arch>
<arch>armhfp</arch> <arch>armhfp</arch>