From 043ef4ff1c84ac56d82f26bc4a0d803ba02e7af3 Mon Sep 17 00:00:00 2001 From: wujing Date: Mon, 27 Sep 2021 11:02:36 +0800 Subject: [PATCH 1/2] upgrade version to 2.0.9 Signed-off-by: wujing --- CMakeLists.txt | 2 +- cmake/options.cmake | 2 +- iSulad.spec | 4 +- release_notes | 139 ++++++++++++++++++++++++++++++++++++++++++++ update-version.sh | 25 ++++---- 5 files changed, 155 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cc1fca70..009e6b79a 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 "9aa57ef27d3719729097f75c65125519497b8b66") +set(GIT_COMMIT_HASH "a35e978c1c11f00c9f6dad519373c413bcfeb049") message("-- commit id: " ${GIT_COMMIT_HASH}) add_definitions(-DISULAD_GIT_COMMIT="${GIT_COMMIT_HASH}") diff --git a/cmake/options.cmake b/cmake/options.cmake index 4795f553a..05a42fd2e 100644 --- a/cmake/options.cmake +++ b/cmake/options.cmake @@ -33,7 +33,7 @@ endif() option(VERSION "set isulad version" ON) if (VERSION STREQUAL "ON") - set(ISULAD_VERSION "2.0.8") + set(ISULAD_VERSION "2.0.9") endif() option(DEBUG "set isulad gcc option" ON) diff --git a/iSulad.spec b/iSulad.spec index 532af2dca..9ef93efe0 100644 --- a/iSulad.spec +++ b/iSulad.spec @@ -1,5 +1,5 @@ -%global _version 2.0.8 -%global _release 20201230.135951.git9aa57ef2 +%global _version 2.0.9 +%global _release 1 %global is_systemd 1 Name: iSulad diff --git a/release_notes b/release_notes index e910011fe..92b15800f 100644 --- a/release_notes +++ b/release_notes @@ -1,3 +1,142 @@ +2021-09-27 root release 2.0.9 + - fix copy to container log processing + - !1173 seccomp: add clone3 to whitelist of x86 From: @gaohuatao Reviewed-by: @duguhaotian,@jingwoo Signed-off-by: @duguhaotian + - !1176 fix compile error From: @wangfengtu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1168 add errno msg for apply diff From: @gaohuatao Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1164 iSulad:Code optimization From: @tiamo0 Reviewed-by: @wangyueliang,@jingwoo,@duguhaotian Signed-off-by: @duguhaotian + - !1167 post sem sync_close_sem in closeWsConnect only From: @zh_xiaoyu Reviewed-by: @gaohuatao,@jingwoo,@duguhaotian Signed-off-by: @duguhaotian + - !1166 update docs of build guide From: @gaohuatao Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1162 cri: modify protobuf map contains method to count method From: @zh_xiaoyu Reviewed-by: @jingwoo,@duguhaotian Signed-off-by: @duguhaotian + - !1161 cri: set session data as lwsContext From: @zh_xiaoyu Reviewed-by: @duguhaotian,@jingwoo Signed-off-by: @duguhaotian + - !1158 CRI: Fix parse metadata of sandbox, sandbox name supports underscores From: @jingwoo Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1157 CI: fix metrics related testcases From: @jingwoo Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1155 Fix iSulad cannot killed by SIGTERM and SIGINT when restful used. From: @tiamo0 Reviewed-by: @duguhaotian,@jingwoo Signed-off-by: @duguhaotian + - !1156 metrics: unbind socket when metrics server shutdown From: @jingwoo Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1153 CRI: fixed session buffer message not output From: @zh_xiaoyu Reviewed-by: @jingwoo,@duguhaotian,@duguhaotian,@jingwoo,@duguhaotian Signed-off-by: @duguhaotian,@duguhaotian + - !1150 remove read lock in websocket write to client From: @zh_xiaoyu Reviewed-by: @jingwoo,@duguhaotian,@duguhaotian Signed-off-by: @duguhaotian + - !1124 Support export isulad's metrics. From: @tiamo0 Reviewed-by: Signed-off-by: + - !1151 The container command completion function is completed From: @lauk001 Reviewed-by: @jingwoo,@duguhaotian,@duguhaotian Signed-off-by: @duguhaotian,@duguhaotian + - !1148 fix unit test compile error From: @wangfengtu Reviewed-by: @gaohuatao,@caihaomin Signed-off-by: @caihaomin + - !1146 modify msg From: @gaohuatao Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian,@duguhaotian + - !1145 make domain name configurable From: @wangfengtu Reviewed-by: @gaohuatao,@jingwoo,@caihaomin Signed-off-by: @caihaomin + - !1144 add default registry transformation in CI From: @wangfengtu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1142 delete unused macro definition From: @wangfengtu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1139 make registry transformation configable From: @wangfengtu Reviewed-by: @duguhaotian,@duguhaotian Signed-off-by: @duguhaotian,@duguhaotian + - !1114 iSulad: add ws session close mutex From: @zh_xiaoyu Reviewed-by: @jingwoo,@duguhaotian Signed-off-by: @duguhaotian + - !1133 CRI: intercept the resize information string when exec resize From: @jingwoo Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1132 do not use CURL_AT_LEAST_VERSION From: @wangfengtu Reviewed-by: @duguhaotian,@gaohuatao Signed-off-by: @duguhaotian + - !1130 fix pull failed if some proxy respone headers From: @wangfengtu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1127 CRI: add some necessary annotations for Sandbox and container From: @jingwoo Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1126 CRI: support exec resize From: @jingwoo Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1125 CI: test default shared namespace in pod From: @jingwoo Reviewed-by: @gaohuatao,@duguhaotian Signed-off-by: @duguhaotian + - !1123 CRI: share uts namespace by default in pod From: @jingwoo Reviewed-by: @duguhaotian,@gaohuatao,@duguhaotian Signed-off-by: @duguhaotian,@duguhaotian + - !1118 CRI: apply a container name label for infra container From: @jingwoo Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1116 fix failed to pull image on mips64 platform. From: @tiamo0 Reviewed-by: @jingwoo,@duguhaotian Signed-off-by: @duguhaotian + - !1117 解决层镜像导入到iSulad概率性失败 From: @meilier Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1115 【轻量级 PR】：update docs/build_guide_zh.md. From: @Annlix Reviewed-by: @caihaomin Signed-off-by: @caihaomin + - !1112 iSulad: alloc 4KB memory for each websocket transfer From: @zh_xiaoyu Reviewed-by: @jingwoo,@lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1111 fix continuous increase of memory usage caused by websocket abnormal disconnection From: @jingwoo Reviewed-by: @duguhaotian,@lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1110 CI: compile lib-shim-v2 with local vendor From: @jingwoo Reviewed-by: @lifeng2221dd1,@gaohuatao Signed-off-by: @lifeng2221dd1 + - !1109 delete shimv2 UT test From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1106 support shim v2 runtime From: @jingwoo Reviewed-by: @gaohuatao,@lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1102 fix cancel deferred remove bug From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1098 devmapper: periodically cleanup devices marked for deleted From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1100 add compile switch to support compile with low version of libcurl From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1099 suppress proxy connect headers message From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1094 fix bug of isula exec when called by crictl From: @jackey_1024 Reviewed-by: @lifeng2221dd1,@lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1087 support auto-resize with kata From: @holyfei Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1086 isula exec --workdir works only when runtime is lcr From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1085 fix string array initialization failure From: @jingwoo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1084 optimize token generation From: @jingwoo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1083 CI: fix integration_check.sh From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1082 do not check key's case when parse http header From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1080 CI: use ali registry instead of docker.io From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1078 log: adjust log level to reduce log From: @lifeng2221dd1 Reviewed-by: @jingwoo,@duguhaotian Signed-off-by: @duguhaotian + - !1077 fix memory usage of stats not right when runtime is kata From: @wangfengtu Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1069 completion isula images From: @yin-xiujiang Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1074 check if pull option is valid From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1073 workdir must be absolute path From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1071 isula: fix --help=xx coredump From: @zh_xiaoyu Reviewed-by: @duguhaotian,@jingwoo,@lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1070 fix memory leak when pulling image From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1063 CI: run the containers one by one From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !962 syslog tag support dynamic tag values From: @duguhaotian Reviewed-by: Signed-off-by: + - !1061 CI devicemapper add filter From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1059 CI:activate vg isulad From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1056 CI:move reinstall_thinpool to helper.sh From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1054 check return value to valid use NULL pointer From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1050 fix bugs when pulling image From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1053 devmapper: decrease log level of check dm device From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1052 CI: keep container when build failed for debug From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1051 fix coredump when poweroff From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1047 Compatible with registry URL ending in '/' From: @wangyueliang Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1049 added default completion From: @yin-xiujiang Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1048 CI: fix CI to fit run on 2 cpu 4G memory environment From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1046 bugfix bugs of isula_rt_ops From: @jackey_1024 Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1045 added autocomplete in isula command line mode. From: @yin-xiujiang Reviewed-by: @kylinyimin,@lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1044 Readme: add script to install iSulad on Ubuntu 20.04 LTS From: @xiyounigo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1043 update libarchive requirement to v3.4 From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1039 stats: show cpu usage normal when stats with --no-stream From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1037 fix residual IO copy thread in CRI exec operation From: @jingwoo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1038 Readme: add script to install iSulad on Centos7 From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1036 event: fix memory leak when pack annotation failed From: @lifeng2221dd1 Reviewed-by: @duguhaotian,@jingwoo Signed-off-by: @duguhaotian + - !990 support cgroup v2 From: @wangfengtu Reviewed-by: Signed-off-by: + - !1035 add iSulad experiment in README From: @zh_xiaoyu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1034 Readme: add configure image registry address From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1023 support isula exec --workdir From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1033 【轻量级 PR】：update docs/build_guide_zh.md. From: @x-zhentao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1014 support --pull option when create/run container From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1019 Readme: add related resouces in readme From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1029 fix coredump when inspect container when daemon sets the ulimit parameters From: @jingwoo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1028 remove unchecked layer ignore rootfs layer From: @duguhaotian Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1027 ignore to create mtab when runtime is kata-runtime From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1018 devicemapper: umount when resize2fs command failed From: @gaohuatao Reviewed-by: @lifeng2221dd1,@lifeng2221dd1 Signed-off-by: @lifeng2221dd1,@lifeng2221dd1 + - !1016 Remove redundant code From: @jingwoo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1013 isulad-shim: fix shim exit bug From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1015 log: adjust log level from EVENT to WARN to reduce log number From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1006 rollback setuped network if mult-network failed From: @duguhaotian Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1010 fix CRI ContainerStats interface cpu/memory/writelayer timestamp error From: @jingwoo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1009 add embedded testcases From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1005 console: client ignore stdin close event From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1008 CI:delete lxc from runc CI test From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1003 restart policy: add support unless-stopped policy From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !1004 bugfix for embedded image From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !1001 cleadcode: Remove extra semicolons From: @jingwoo Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !998 modify resume task name and some log msg From: @gaohuatao Reviewed-by: Signed-off-by: + - !999 thread function calls DAEMON_CLEAR_ERRORMSG to prevent memory leak From: @jingwoo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !997 name_id_index: fix restore fail to remove name index From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !996 devmapper: modify log msg From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !993 fd leak check in cp.sh should not include pull fd check From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !992 unpack: try to remove and replace dst_path while unpack From: @lifeng2221dd1 Reviewed-by: @duguhaotian,@duguhaotian Signed-off-by: @duguhaotian,@duguhaotian + - !988 stats: fix wrong memory usage info in stats From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !989 save health check log to disk before unhealthy From: @jingwoo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !985 sleep some time before calculate to make sure fd closed From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !983 add container lock when clean container resource From: @zh_xiaoyu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !980 iSulad: calculate memusage with used - total_inactive_file From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !965 fix container exit health check residue and multiple health checks From: @jingwoo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !979 Fix create env path dir if dir exist From: @zhangsong234 Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !976 spec: add verify for device cgroup access mode From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !977 init log config should before command parse From: @duguhaotian Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !975 log: use the same function to init log in export/pause/resume From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !973 GC: add log container info when add into gc From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !972 ignore error if get ip failed From: @duguhaotian Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !969 driver: do not set g_graphdriver to NULL From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !968 driver: do not unlock and destroy lock when clean up From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !964 adapt for sparse file when tar file From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !960 CI: add testcase for exec without pty From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !957 shim: optimize io stream From: @gaohuatao Reviewed-by: @leizhongkai,@lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !958 fix ramdom coredump if pull failed From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !953 fix small probability of coredump in CRI streaming services in high concurrency scenarios From: @jingwoo Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !955 image_cb: rename the function {isula_/docker_} to do_ From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !943 do not pause container when copy From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !947 judge isula load file exists From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !937 clean code: fix clean code From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian + - !931 devmapper: fix udev wait thread resource leak From: @gaohuatao Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + - !930 make thread detach to avoid resource leak From: @wangfengtu Reviewed-by: @lifeng2221dd1 Signed-off-by: @lifeng2221dd1 + + dev stats: + - 230 files changed, 9855 insertions(+), 1949 deletions(-) + - contributors: WangFengTu, gaohuatao, wujing, Li Feng, zhangxiaoyu, haozi007, Tiamo0, lifeng68, jikui, Annlix, NiGo, XiyouNiGo, holyfei, lauk001, wangyueliang, xiapin, xingweizheng, yin-xiujiang, yinxiujiang, zhangsong234, 尹秀江, 许振涛 + 2020-12-30 lifeng release 2.0.8 - !920 implent inspect of multy formats From: @jackey_1024 Reviewed-by: Signed-off-by: - !925 utils: add close fds for utils exec cmd From: @lifeng2221dd1 Reviewed-by: @duguhaotian Signed-off-by: @duguhaotian diff --git a/update-version.sh b/update-version.sh index b8ccf3966..3788b83fb 100755 --- a/update-version.sh +++ b/update-version.sh @@ -3,7 +3,7 @@ # ./update-version.sh ####################################################################### -##- @Copyright (C) Huawei Technologies., Ltd. 2019. All rights reserved. +##- @Copyright (C) Huawei Technologies., Ltd. 2019-2021. All rights reserved. # - iSulad licensed under the Mulan PSL v2. # - You can use this software according to the terms and conditions of the Mulan PSL v2. # - You may obtain a copy of Mulan PSL v2 at: @@ -46,35 +46,34 @@ old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print first_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $1'}) second_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $2'}) third_old_version=$(cat ${specfile} | grep "%global" | grep "_version" | awk {'print $3'} | awk -F "." {'print $3'}) -read -p "Which level version do you want to upgrade?[1/2/3/d/N](default:N) select:" choice +read -p "Which level version do you want to upgrade?[1/2/3/r/N](default:N) select:" choice if [[ ! -n "${choice}" || ${choice} == "N" ]]; then - echo "The version number has not been modified, it is still ${old_version}" - exit 0 + echo "The version number has not been modified, it is still ${old_version}" + exit 0 fi if [[ ${choice} -eq "1" ]]; then - first_old_version=$(($first_old_version+1)) - second_old_version="0" - third_old_version="0" + first_old_version=$(($first_old_version+1)) + second_old_version="0" + third_old_version="0" elif [[ ${choice} -eq "2" ]]; then - second_old_version=$(($second_old_version+1)) - third_old_version="0" + second_old_version=$(($second_old_version+1)) + third_old_version="0" elif [[ ${choice} -eq "3" ]]; then - third_old_version=$(($third_old_version+1)) + third_old_version=$(($third_old_version+1)) fi new_version=${first_old_version}.${second_old_version}.${third_old_version} -if [[ ${choice} -ne "d" ]]; then +if [[ ${choice} -ne "r" ]]; then update_release_notes "$new_version" fi echo "The version number has been modified: ${old_version} => ${new_version}" old_release=$(cat ${specfile} | grep "%global" | grep "_release" | awk {'print $3'}) +new_release=$(($old_release+1)) commit_id_long=`git log --pretty=oneline -1 | awk {'print $1'}` -commit_id=${commit_id_long:0:8} -new_release=`date "+%Y%m%d"`.`date "+%H%M%S"`.git$commit_id echo "The relase version has been modified, it is ${new_release}" sed -i "s/set(ISULAD_VERSION \"${old_version}\")/set(ISULAD_VERSION \"${new_version}\")/g" ${Version_CMakefile} sed -i "s/^.*set(GIT_COMMIT_HASH.*$/set(GIT_COMMIT_HASH \"${commit_id_long}\")/g" ${Cmakefile} -- Gitee From 5a6bae5038ba334877d73b9e6e08404fe865117c Mon Sep 17 00:00:00 2001 From: wujing Date: Wed, 29 Sep 2021 11:57:19 +0800 Subject: [PATCH 2/2] fix docs/install_iSulad_on_Ubuntu_20_04_LTS.sh Signed-off-by: wujing --- docs/install_iSulad_on_Ubuntu_20_04_LTS.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/install_iSulad_on_Ubuntu_20_04_LTS.sh b/docs/install_iSulad_on_Ubuntu_20_04_LTS.sh index 630febe18..4f27244ea 100644 --- a/docs/install_iSulad_on_Ubuntu_20_04_LTS.sh +++ b/docs/install_iSulad_on_Ubuntu_20_04_LTS.sh @@ -18,7 +18,6 @@ mkdir -p $BUILD_DIR cd $BUILD_DIR git clone https://gitee.com/src-openeuler/lxc.git cd lxc -tar -zxf lxc-4.0.3.tar.gz ./apply-patches cd lxc-4.0.3 ./autogen.sh -- Gitee