github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

packaging: fix image build script

Browse Source 
Relative paths are error prone. Fix error.

Signed-off-by: Eric Ernst <eric.g.ernst@gmail.com>
This commit is contained in:
Eric Ernst 2020-10-06 16:48:35 -07:00 committed by Eric Ernst
parent fb2f3cfce2
commit 9b969bb7da
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/packaging/guest-image/build_image.sh
View File

@ -13,13 +13,14 @@ set -o pipefail
readonly script_name="$(basename "${BASH_SOURCE[0]}")" readonly script_name="$(basename "${BASH_SOURCE[0]}")"
readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" readonly script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
readonly packaging_root_dir="$(cd "${script_dir}/../" && pwd)"
readonly repo_root_dir="$(cd "${script_dir}/../../../" && pwd)" readonly repo_root_dir="$(cd "${script_dir}/../../../" && pwd)"
readonly osbuilder_dir="$(cd "${repo_root_dir}/tools/osbuilder" && pwd)" readonly osbuilder_dir="$(cd "${repo_root_dir}/tools/osbuilder" && pwd)"
readonly tmp_dir=$(mktemp -d -t build-image-tmp.XXXXXXXXXX) readonly tmp_dir=$(mktemp -d -t build-image-tmp.XXXXXXXXXX)
export GOPATH="${tmp_dir}/go" export GOPATH="${tmp_dir}/go"
export GOPATH=${GOPATH:-${HOME}/go} export GOPATH=${GOPATH:-${HOME}/go}
source "${repo_root_dir}/scripts/lib.sh" source "${packaging_root_dir}/scripts/lib.sh"
exit_handler() { exit_handler() {
[ -d "${tmp_dir}" ] && sudo rm -rf "$tmp_dir" [ -d "${tmp_dir}" ] && sudo rm -rf "$tmp_dir"
@ -28,7 +29,7 @@ trap exit_handler EXIT
arch_target="$(uname -m)" arch_target="$(uname -m)"
source "${repo_root_dir}/versions.txt" source "${packaging_root_dir}/versions.txt"
readonly destdir="${PWD}" readonly destdir="${PWD}"

2
tools/packaging/scripts/lib.sh
View File

@ -11,6 +11,8 @@ export tests_repo_dir="$GOPATH/src/$tests_repo"
this_script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" this_script_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
short_commit_length=10
hub_bin="hub-bin" hub_bin="hub-bin"
clone_tests_repo() { clone_tests_repo() {