libisulad_img.so shared library

Signed-off-by: NZhangxiaoyu <zhangxiaoyu58@huawei.com>

CMakeLists.txt

@@ -91,6 +91,8 @@ install(FILES src/cutils/error.h
 	DESTINATION include/isulad)
 install(FILES src/daemon/runtime/engines/engine.h
 	DESTINATION include/isulad)
+install(FILES src/daemon/image/image.h
+	DESTINATION include/isulad)
 
 # install config files
 set(conf_prefix "/etc")

iSulad.spec

@@ -16,6 +16,7 @@ ExclusiveArch:  x86_64 aarch64
 %ifarch x86_64 aarch64
 Provides:       libhttpclient.so()(64bit)
 Provides:       libisula.so()(64bit)
+Provides:       libisulad_img.so()(64bit)
 %endif
 
 %if 0%{?is_systemd}
@@ -62,6 +63,7 @@ cd build
 install -d $RPM_BUILD_ROOT/%{_libdir}
 install -m 0644 ./src/libisula.so             %{buildroot}/%{_libdir}/libisula.so
 install -m 0644 ./src/http/libhttpclient.so  %{buildroot}/%{_libdir}/libhttpclient.so
+install -m 0644 ./src/daemon/image/libisulad_img.so   %{buildroot}/%{_libdir}/libisulad_img.so
 
 install -d $RPM_BUILD_ROOT/%{_libdir}/pkgconfig
 install -m 0640 ./conf/isulad.pc              %{buildroot}/%{_libdir}/pkgconfig/isulad.pc
@@ -77,6 +79,7 @@ install -m 0644 ../src/client/connect/isula_connect.h		%{buildroot}/%{_includedi
 install -m 0644 ../src/cutils/utils_timestamp.h			%{buildroot}/%{_includedir}/isulad/utils_timestamp.h
 install -m 0644 ../src/cutils/error.h				%{buildroot}/%{_includedir}/isulad/error.h
 install -m 0644 ../src/daemon/runtime/engines/engine.h			%{buildroot}/%{_includedir}/isulad/engine.h
+install -m 0644 ../src/daemon/image/image.h         %{buildroot}/%{_includedir}/isulad/image.h
 
 install -d $RPM_BUILD_ROOT/%{_sysconfdir}/isulad
 install -m 0640 ../src/contrib/config/daemon.json           %{buildroot}/%{_sysconfdir}/isulad/daemon.json

src/daemon/image/CMakeLists.txt

@@ -41,3 +41,62 @@ set(IMAGE_INCS
     ${local_image_incs}
     PARENT_SCOPE
     )
+
+# set sources and headers for libisulad_img
+set(LIB_ISULAD_IMG libisulad_img)
+
+add_library(${LIB_ISULAD_IMG} ${LIBTYPE}
+    ${local_image_srcs}
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils_regex.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils_file.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils_verify.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils_array.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils_convert.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils_string.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils_base64.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils_timestamp.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils_fs.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/utils_aes.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/util_atomic.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/filters.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/path.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/map/map.c
+    ${CMAKE_SOURCE_DIR}/src/cutils/map/rb_tree.c
+    ${CMAKE_SOURCE_DIR}/src/sha256/sha256.c
+    ${CMAKE_SOURCE_DIR}/src/daemon/libisulad.c
+    ${CMAKE_SOURCE_DIR}/src/daemon/isulad_config.c
+    ${CMAKE_SOURCE_DIR}/src/daemon/daemon_arguments.c
+    ${CMAKE_SOURCE_DIR}/src/daemon/spec/sysinfo.c
+    ${CMAKE_SOURCE_DIR}/src/tar/isulad_tar.c
+    ${CMAKE_SOURCE_DIR}/src/tar/util_archive.c
+    )
+
+target_include_directories(${LIB_ISULAD_IMG} PUBLIC
+    ${local_image_incs}
+    ${CMAKE_SOURCE_DIR}/src
+    ${CMAKE_SOURCE_DIR}/src/sha256
+    ${CMAKE_SOURCE_DIR}/src/http
+    ${CMAKE_SOURCE_DIR}/src/tar
+    ${CMAKE_SOURCE_DIR}/src/daemon
+    ${CMAKE_SOURCE_DIR}/src/daemon/spec/
+    ${CMAKE_SOURCE_DIR}/src/daemon/container
+    ${CMAKE_SOURCE_DIR}/src/daemon/runtime
+    ${CMAKE_SOURCE_DIR}/src/daemon/container/restart_manager
+    ${CMAKE_SOURCE_DIR}/src/daemon/container/health_check
+    ${CMAKE_SOURCE_DIR}/src/cutils
+    ${CMAKE_SOURCE_DIR}/src/cutils/map
+    ${CHECKED_INCLUDE_DIRS}
+    )
+
+# set libisulad_img FLAGS
+set_target_properties(${LIB_ISULAD_IMG} PROPERTIES PREFIX "")
+target_link_libraries(${LIB_ISULAD_IMG}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${ISULA_LIBUTILS_LIBRARY}
+    ${DEVMAPPER_LIBRARY}
+    ${LIBTAR_LIBRARY}
+    -lpthread -lcrypto -larchive -lz libhttpclient)
+
+install(TARGETS ${LIB_ISULAD_IMG}
+    LIBRARY DESTINATION ${LIB_INSTALL_DIR_DEFAULT} PERMISSIONS OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE)
\ No newline at end of file

src/daemon/image/external/ext_image.c

@@ -24,6 +24,7 @@
 #include "isula_libutils/log.h"
 #include "utils.h"
 #include "ext_image.h"
+#include "libisulad.h"
 
 #ifdef ENABLE_OCI_IMAGE
 #include "storage.h"

src/daemon/image/image.h

@@ -23,7 +23,6 @@
 #include "isula_libutils/oci_runtime_spec.h"
 #include "isula_libutils/host_config.h"
 #include "isula_libutils/container_config.h"
-#include "libisulad.h"
 #include "isula_libutils/isulad_daemon_configs.h"
 #include "isula_libutils/container_inspect.h"
 #include "isula_libutils/imagetool_images_list.h"

src/daemon/image/oci/oci_common_operators.c

@@ -25,6 +25,7 @@
 #include "utils.h"
 #include "utils_images.h"
 #include "oci_config_merge.h"
+#include "libisulad.h"
 
 #include "filters.h"
 #include "storage.h"

src/daemon/image/oci/oci_load.h

@@ -20,6 +20,7 @@
 #include "isula_libutils/oci_image_manifest.h"
 #include "isula_libutils/oci_image_spec.h"
 #include "isula_libutils/json_common.h"
+#include "libisulad.h"
 
 #ifdef __cplusplus
 extern "C" {

src/daemon/image/oci/oci_pull.c

@@ -20,6 +20,7 @@
 #include "oci_common_operators.h"
 #include "registry.h"
 #include "isulad_config.h"
+#include "libisulad.h"
 #include "storage.h"
 
 static int decode_auth(char *auth, char **username, char **password)

src/daemon/image/oci/registry/registry.c

@@ -38,6 +38,7 @@
 #include "linked_list.h"
 #include "pthread.h"
 #include "isulad_config.h"
+#include "libisulad.h"
 #include "storage.h"
 #include "constants.h"
 #include "utils_images.h"