mirror of
https://github.com/kata-containers/kata-containers.git
synced 2026-05-01 23:01:47 +00:00
tools: Fix shellcheck issues in build.sh
Fix shellcheck warnings and notes identified by running shellcheck --severity=style. Signed-off-by: Fabiano Fidêncio <ffidencio@nvidia.com>
This commit is contained in:
@@ -11,6 +11,7 @@ set -o pipefail
|
||||
script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||
readonly pause_image_builder="${script_dir}/build-static-pause-image.sh"
|
||||
|
||||
# shellcheck source=/dev/null
|
||||
source "${script_dir}/../../scripts/lib.sh"
|
||||
|
||||
DESTDIR=${DESTDIR:-${PWD}}
|
||||
@@ -19,21 +20,24 @@ pause_image_repo="${pause_image_repo:-}"
|
||||
pause_image_version="${pause_image_version:-}"
|
||||
package_output_dir="${package_output_dir:-}"
|
||||
|
||||
[ -n "${pause_image_repo}" ] || pause_image_repo=$(get_from_kata_deps ".externals.pause.repo")
|
||||
[ -n "${pause_image_version}" ] || pause_image_version=$(get_from_kata_deps ".externals.pause.version")
|
||||
[[ -n "${pause_image_repo}" ]] || pause_image_repo=$(get_from_kata_deps ".externals.pause.repo")
|
||||
[[ -n "${pause_image_version}" ]] || pause_image_version=$(get_from_kata_deps ".externals.pause.version")
|
||||
|
||||
[ -n "${pause_image_repo}" ] || die "Failed to get pause image repo"
|
||||
[ -n "${pause_image_version}" ] || die "Failed to get pause image version or commit"
|
||||
[[ -n "${pause_image_repo}" ]] || die "Failed to get pause image repo"
|
||||
[[ -n "${pause_image_version}" ]] || die "Failed to get pause image version or commit"
|
||||
|
||||
container_image="${PAUSE_IMAGE_CONTAINER_BUILDER:-$(get_pause_image_name)}"
|
||||
[ "${CROSS_BUILD}" == "true" ] && container_image="${container_image}-cross-build"
|
||||
# shellcheck disable=SC2154
|
||||
[[ "${CROSS_BUILD}" == "true" ]] && container_image="${container_image}-cross-build"
|
||||
|
||||
docker pull ${container_image} || \
|
||||
(docker $BUILDX build $PLATFORM \
|
||||
# shellcheck disable=SC2154,SC2086
|
||||
docker pull "${container_image}" || \
|
||||
(docker ${BUILDX} build ${PLATFORM} \
|
||||
-t "${container_image}" "${script_dir}" && \
|
||||
# No-op unless PUSH_TO_REGISTRY is exported as "yes"
|
||||
push_to_registry "${container_image}")
|
||||
|
||||
# shellcheck disable=SC2154
|
||||
docker run --rm -i -v "${repo_root_dir}:${repo_root_dir}" \
|
||||
-w "${PWD}" \
|
||||
--env DESTDIR="${DESTDIR}" \
|
||||
|
||||
Reference in New Issue
Block a user