github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-15 16:13:20 +00:00
Code Issues Projects Releases Wiki Activity

image: build: rename varaible

Browse Source 
kata_osbuilder_vesion is already defined in versions.txt

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2019-04-30 13:55:24 -05:00
parent 25496caf18
commit ac7eb355e4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
obs-packaging/kata-containers-image/build_image.sh
View File

@ -32,7 +32,7 @@ arch_target="$(uname -m)"
kata_version="master" kata_version="master"
# osbuilder info # osbuilder info
kata_osbuilder_version="${KATA_OSBUILDER_VERSION:-}" osbuider_version="${KATA_OSBUILDER_VERSION:-}"
# Agent version # Agent version
agent_version="${AGENT_VERSION:-}" agent_version="${AGENT_VERSION:-}"
if [ -z "${agent_version}" ]; then if [ -z "${agent_version}" ]; then
@ -68,9 +68,9 @@ create_tarball() {
agent_sha=$(get_repo_hash "${GOPATH}/src/github.com/kata-containers/agent") agent_sha=$(get_repo_hash "${GOPATH}/src/github.com/kata-containers/agent")
#reduce sha size for short names #reduce sha size for short names
agent_sha=${agent_sha:0:${short_commit_length}} agent_sha=${agent_sha:0:${short_commit_length}}
tarball_name="kata-containers-${kata_osbuilder_version}-${agent_sha}-${arch_target}.tar.gz" tarball_name="kata-containers-${osbuider_version}-${agent_sha}-${arch_target}.tar.gz"
image_name="kata-containers-image_${img_distro}_${kata_osbuilder_version}_agent_${agent_sha}.img" image_name="kata-containers-image_${img_distro}_${osbuider_version}_agent_${agent_sha}.img"
initrd_name="kata-containers-initrd_${initrd_distro}_${kata_osbuilder_version}_agent_${agent_sha}.initrd" initrd_name="kata-containers-initrd_${initrd_distro}_${osbuider_version}_agent_${agent_sha}.initrd"
mv "${tmp_dir}/osbuilder/kata-containers.img" "${image_name}" mv "${tmp_dir}/osbuilder/kata-containers.img" "${image_name}"
mv "${tmp_dir}/osbuilder/kata-containers-initrd.img" "${initrd_name}" mv "${tmp_dir}/osbuilder/kata-containers-initrd.img" "${initrd_name}"
@ -107,7 +107,7 @@ main() {
esac esac
done done
# osbuilder info # osbuilder info
[ -n "${kata_osbuilder_version}" ] || kata_osbuilder_version="${kata_version}" [ -n "${osbuider_version}" ] || osbuider_version="${kata_version}"
# Agent version # Agent version
[ -n "${agent_version}" ] || agent_version="${kata_version}" [ -n "${agent_version}" ] || agent_version="${kata_version}"
@ -126,7 +126,7 @@ main() {
shift "$((OPTIND - 1))" shift "$((OPTIND - 1))"
git clone "$osbuilder_url" "${tmp_dir}/osbuilder" git clone "$osbuilder_url" "${tmp_dir}/osbuilder"
pushd "${tmp_dir}/osbuilder" pushd "${tmp_dir}/osbuilder"
git checkout "${kata_osbuilder_version}" git checkout "${osbuider_version}"
build_initrd build_initrd
build_image build_image
create_tarball create_tarball