diff --git a/CMakeLists.txt b/CMakeLists.txt index 64caa08e0dadc65840da712b0ab6357d21e03f1a..db7a6fc9af3a58dd68c0cac9a95002604aba63bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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}") diff --git a/iSulad.spec b/iSulad.spec index 836e1891302df8cefc73d3fcc404c4c489995d63..e622943740a027e9a8dbb494fa058d5dec0b6db3 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ %global _version 2.0.0 -%global _release 20200402.163225.git5bb8c3f5 +%global _release 20200403.055852.git836228b6 %global is_systemd 1 %global debug_package %{nil} diff --git a/src/services/execution/execute/execution_information.c b/src/services/execution/execute/execution_information.c index 3199b8bdd388142b7d40a5f4c8046b982dd4cd0b..cc29e27b76f7b5d380aa6debcfe3772cb26ae2a9 100644 --- a/src/services/execution/execute/execution_information.c +++ b/src/services/execution/execute/execution_information.c @@ -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