提交 1352f7bd 编写于 作者: O openeuler-ci-bot 提交者: Gitee

!167 Get driver's metadata only when it's oci image

Merge pull request !167 from wangfengtu/only_oci
......@@ -9,7 +9,7 @@ include(cmake/set_build_flags.cmake)
#set(CMAKE_C_COMPILER "gcc" CACHE PATH "c compiler")
set(GIT_COMMIT_HASH "5bb8c3f59aa1d1c9a7ec543eeca97e54059942c1")
set(GIT_COMMIT_HASH "836228b6be4f000597c484a2862564134d25d9d0")
message("-- commit id: " ${GIT_COMMIT_HASH})
add_definitions(-DISULAD_GIT_COMMIT="${GIT_COMMIT_HASH}")
......
%global _version 2.0.0
%global _release 20200402.163225.git5bb8c3f5
%global _release 20200403.055852.git836228b6
%global is_systemd 1
%global debug_package %{nil}
......
......@@ -1345,10 +1345,12 @@ static int pack_inspect_data(const container_t *cont, container_inspect **out_in
}
#ifdef ENABLE_OCI_IMAGE
inspect->graph_driver = graphdriver_get_metadata(cont->common_config->id);
if (inspect->graph_driver == NULL) {
ret = -1;
goto out;
if (!strcmp(cont->common_config->image_type, IMAGE_TYPE_OCI)) {
inspect->graph_driver = graphdriver_get_metadata(cont->common_config->id);
if (inspect->graph_driver == NULL) {
ret = -1;
goto out;
}
}
#endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册