8f1048f840
This commit refactors the OCI images support:
* added import_container_image and export_container_image methods
to oci_tools classes. 'umoci' and 'buildah' consume different
formats thus the inital skopeo call to import a container is tool
dependent.
* use oci-archive transport for packing the OCI images, this causes
docker and oci operations to just diverge on transport type.
* add_tag method no longer needed in oci_tools/base, skopeo is used
for that matter.
* container/docker.py class is no longer needed. The difference
between docker and OCI images is just on packing format which is just
a parameter in skopeo. It does not deserve a dedicated class
* system/root_import/docker.py class no longer needed. The difference
between OCI and Docker class was just the transport type for the
skopeo call. It does not deserve a dedicated class
60 lines
1.8 KiB
Python
60 lines
1.8 KiB
Python
# Copyright (c) 2015 SUSE Linux GmbH. All rights reserved.
|
|
#
|
|
# This file is part of kiwi.
|
|
#
|
|
# kiwi is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# kiwi is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with kiwi. If not, see <http://www.gnu.org/licenses/>
|
|
#
|
|
# project
|
|
from kiwi.system.root_import.oci import RootImportOCI
|
|
from kiwi.exceptions import KiwiRootImportError
|
|
from kiwi.logger import log
|
|
|
|
|
|
class RootImport(object):
|
|
"""
|
|
Root import factory
|
|
|
|
Attibutes
|
|
|
|
* :attr:`root_dir`
|
|
root directory path name
|
|
|
|
* :attr:`image_uri`
|
|
a uri to an image containing a the root system
|
|
|
|
* :attr:`image_type`
|
|
type of the image to import
|
|
"""
|
|
def __new__(self, root_dir, image_uri, image_type):
|
|
log.info(
|
|
'Importing root from a {0} image type'.format(image_type)
|
|
)
|
|
if image_type == 'docker':
|
|
root_import = RootImportOCI(
|
|
root_dir, image_uri,
|
|
custom_args={'archive_transport': 'docker-archive'}
|
|
)
|
|
elif image_type == 'oci':
|
|
root_import = RootImportOCI(
|
|
root_dir, image_uri,
|
|
custom_args={'archive_transport': 'oci-archive'}
|
|
)
|
|
else:
|
|
raise KiwiRootImportError(
|
|
'Support to import {0} images not implemented'.format(
|
|
image_type
|
|
)
|
|
)
|
|
return root_import
|