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
47 lines
1.5 KiB
Python
47 lines
1.5 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.container.oci import ContainerImageOCI
|
|
|
|
from kiwi.exceptions import (
|
|
KiwiContainerImageSetupError
|
|
)
|
|
|
|
|
|
class ContainerImage(object):
|
|
"""
|
|
**Container Image factory**
|
|
|
|
:param string name: container system name
|
|
:param string root_dir: root directory path name
|
|
:param dict custom_args: custom arguments
|
|
"""
|
|
def __new__(self, name, root_dir, custom_args=None):
|
|
if name == 'docker':
|
|
return ContainerImageOCI(
|
|
root_dir, 'docker-archive', custom_args=custom_args
|
|
)
|
|
elif name == 'oci':
|
|
return ContainerImageOCI(
|
|
root_dir, 'oci-archive', custom_args=custom_args
|
|
)
|
|
else:
|
|
raise KiwiContainerImageSetupError(
|
|
'Support for %s container not implemented' % name
|
|
)
|