From a068184f186eba03a0bfed0f2206156cdea524e3 Mon Sep 17 00:00:00 2001 From: wangchuanguo Date: Fri, 1 Sep 2023 20:01:59 +0800 Subject: [PATCH] get docker image name from os-release not in localOS but in repo-installed-dir Signed-off-by: wangchuanguo --- create-docker.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/create-docker.sh b/create-docker.sh index 4e9de58..7a3d8a8 100755 --- a/create-docker.sh +++ b/create-docker.sh @@ -97,8 +97,6 @@ while getopts ":s:d:y:p:g:t:h" opt; do ;; esac done -name=`cat /etc/os-release | grep "^NAME" | cut -d \" -f2` -name=`echo $name|sed 's/ /-/g'|awk '{print tolower($0)}'` if [[ "$filetarget" != "" && "$filesrc" == "" ]];then echo "-s must have value when -d has value" @@ -240,6 +238,9 @@ if [ "$filetarget" != "" ]; then fi fi +name=`cat "$target"/etc/os-release | grep "^NAME" | cut -d \" -f2` +name=`echo $name|sed 's/ /-/g'|awk '{print tolower($0)}'` + if [ -z "$version" ]; then ls "$target"/etc/ for file in "$target"/etc/{kos,anolis,system}-release; do -- Gitee