diff --git a/context/rootfs/scripts/docker.sh b/context/rootfs/scripts/docker.sh index 3d1a5e7..51cc377 100644 --- a/context/rootfs/scripts/docker.sh +++ b/context/rootfs/scripts/docker.sh @@ -17,7 +17,8 @@ set -x set -e # shellcheck disable=SC2046 -scripts_path=$(cd `dirname $0`; pwd) +# shellcheck disable=SC2006 +scripts_path=$(cd `dirname "$0"`; pwd) image_dir="$scripts_path/../images" DOCKER_VERSION="19.03.14-sealer" @@ -47,6 +48,7 @@ load_images() { done } +# shellcheck disable=SC2006 check_docker_valid() { if ! docker info 2>&1; then panic "docker is not healthy: $(docker info 2>&1), please check" @@ -59,7 +61,7 @@ check_docker_valid() { } storage=${1:-/var/lib/docker} -mkdir -p $storage +mkdir -p "$storage" if ! utils_command_exists docker; then lsb_dist=$(get_distribution) lsb_dist="$(echo "$lsb_dist" | tr '[:upper:]' '[:lower:]')" diff --git a/context/rootfs/scripts/init-kube.sh b/context/rootfs/scripts/init-kube.sh index b599708..0886785 100644 --- a/context/rootfs/scripts/init-kube.sh +++ b/context/rootfs/scripts/init-kube.sh @@ -2,7 +2,8 @@ # shellcheck disable=SC2046 # shellcheck disable=SC2164 -scripts_path=$(cd `dirname $0`; pwd) +# shellcheck disable=SC2006 +scripts_path=$(cd `dirname "$0"`; pwd) source "${scripts_path}"/utils.sh set -x @@ -58,4 +59,4 @@ copy_kubelet_service systemctl enable kubelet # nvidia-docker.sh need set kubelet labels, it should be run after kubelet -bash ${scripts_path}/nvidia-docker.sh || exit 1 \ No newline at end of file +bash "${scripts_path}"/nvidia-docker.sh || exit 1 \ No newline at end of file diff --git a/context/rootfs/scripts/init-registry.sh b/context/rootfs/scripts/init-registry.sh index 23b27cc..0a335c8 100644 --- a/context/rootfs/scripts/init-registry.sh +++ b/context/rootfs/scripts/init-registry.sh @@ -89,20 +89,21 @@ regArgs="-d --restart=always \ -e REGISTRY_HTTP_DEBUG_ADDR=0.0.0.0:5001 \ -e REGISTRY_HTTP_DEBUG_PROMETHEUS_ENABLED=true" -if [ -f $config ]; then - sed -i "s/5000/$1/g" $config +if [ -f "$config" ]; then + sed -i "s/5000/$1/g" "$config" regArgs="$regArgs \ -v $config:/etc/docker/registry/config.yml" fi -if [ -f $htpasswd ]; then - docker run $regArgs \ + # shellcheck disable=SC2086 +if [ -f "$htpasswd" ]; then + docker run "$regArgs" \ -v $htpasswd:/htpasswd \ -e REGISTRY_AUTH=htpasswd \ -e REGISTRY_AUTH_HTPASSWD_PATH=/htpasswd \ -e REGISTRY_AUTH_HTPASSWD_REALM="Registry Realm" registry:2.7.1 || startRegistry else - docker run $regArgs registry:2.7.1 || startRegistry + docker run "$regArgs" registry:2.7.1 || startRegistry fi check_registry \ No newline at end of file diff --git a/context/rootfs/scripts/init.sh b/context/rootfs/scripts/init.sh index 1e1ee59..79a6ac8 100644 --- a/context/rootfs/scripts/init.sh +++ b/context/rootfs/scripts/init.sh @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +# shellcheck disable=SC2181 STORAGE=${1:-/var/lib/docker} REGISTRY_DOMAIN=${2-sea.hub} REGISTRY_PORT=${3-5000} @@ -20,7 +21,7 @@ REGISTRY_PORT=${3-5000} # Install docker chmod a+x docker.sh #./docker.sh /var/docker/lib sealer.hub 5001 -bash docker.sh ${STORAGE} ${REGISTRY_DOMAIN} $REGISTRY_PORT +bash docker.sh "${STORAGE}" "${REGISTRY_DOMAIN}" "$REGISTRY_PORT" if [ $? -ne 0 ]; then exit 1 fi diff --git a/context/rootfs/scripts/nvidia-docker.sh b/context/rootfs/scripts/nvidia-docker.sh index 20ae45c..9a6d0dd 100644 --- a/context/rootfs/scripts/nvidia-docker.sh +++ b/context/rootfs/scripts/nvidia-docker.sh @@ -4,7 +4,10 @@ # shellcheck disable=SC2164 # shellcheck disable=SC2092 # shellcheck disable=SC1102 -scripts_path=$(cd `dirname $0`; pwd) +# shellcheck disable=SC2006 +# shellcheck disable=SC2005 +# shellcheck disable=SC2181 +scripts_path=$(cd `dirname "$0"`; pwd) source "${scripts_path}"/utils.sh set -x @@ -50,7 +53,7 @@ public::nvidia::enable_gpu_device_plugin() { } kube::nvidia::detect_gpu(){ - tar -xvf ${scripts_path}/../tgz/nvidia.tgz -C ${scripts_path}/../rpm/ + tar -xvf "${scripts_path}"/../tgz/nvidia.tgz -C ${scripts_path}/../rpm/ kube::nvidia::setup_lspci lspci | grep -i nvidia > /dev/null 2>&1 if [[ "$?" == "0" ]]; then @@ -80,13 +83,13 @@ public::nvidia::install_nvidia_driver(){ public::nvidia::install_nvidia_docker2(){ sleep 3 if `which nvidia-container-runtime > /dev/null 2>&1` && [ $(echo $((docker info | grep nvidia) | wc -l)) -gt 1 ] ; then - utils_info 'nvidia-container-runtime is already insatlled' + utils_info 'nvidia-container-runtime is already installed' return fi # 1. Install nvidia-container-runtime # shellcheck disable=SC2046 - if ! output=$(rpm -ivh --force --nodeps `ls ${RPM_DIR}/*.rpm` 2>&1);then + if ! output=$(rpm -ivh --force --nodeps `ls "${RPM_DIR}"/*.rpm` 2>&1);then panic "failed to install rpm, output:${output}, maybe your rpm db was broken, please see https://cloudlinux.zendesk.com/hc/en-us/articles/115004075294-Fix-rpmdb-Thread-died-in-Berkeley-DB-library for help" fi @@ -113,9 +116,9 @@ public::nvidia::install_nvidia_docker2(){ # deploy nvidia plugin in static pod public::nvidia::deploy_static_pod() { mkdir -p /etc/kubernetes/manifests - cp -f ${scripts_path}/../statics/nvidia-device-plugin.yml /etc/kubernetes/manifests/nvidia-device-plugin.yml + cp -f "${scripts_path}"/../statics/nvidia-device-plugin.yml /etc/kubernetes/manifests/nvidia-device-plugin.yml - utils_info "nvidia-device-plugin yaml succefully deployed ..." + utils_info "nvidia-device-plugin yaml successfully deployed ..." } public::nvidia::enable_gpu_capability diff --git a/context/rootfs/scripts/utils.sh b/context/rootfs/scripts/utils.sh index 897d9e1..3913279 100644 --- a/context/rootfs/scripts/utils.sh +++ b/context/rootfs/scripts/utils.sh @@ -2,6 +2,8 @@ # shellcheck disable=SC2145 # shellcheck disable=SC2155 +# shellcheck disable=SC2126 +# shellcheck disable=SC2002 utils_version_ge() { test "$(echo "$@" | tr ' ' '\n' | sort -rV | head -n 1)" == "$1" }