github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-14 13:29:31 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #217 from jcvenegas/fix-image

Browse Source 
image: Fix image build
This commit is contained in:
Julio Montes
2018-10-05 11:30:01 -05:00
committed by GitHub
parent a4912d69f1 47010dd2ea
commit cb4392542b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ build_initrd() {
DEBUG="${DEBUG:-}" \ DEBUG="${DEBUG:-}" \
AGENT_VERSION="${agent_version}" \ AGENT_VERSION="${agent_version}" \
OS_VERSION="${initrd_os_version}" \ OS_VERSION="${initrd_os_version}" \
DISTRO_ROOTFS="${tmp_dir}/initrd-image" \ ROOTFS_BUILD_DEST="${tmp_dir}/initrd-image" \
USE_DOCKER=1 \ USE_DOCKER=1 \
AGENT_INIT="yes" AGENT_INIT="yes"
@@ -56,7 +56,7 @@ build_image() {
USE_DOCKER="1" \ USE_DOCKER="1" \
AGENT_VERSION="${agent_version}" \ AGENT_VERSION="${agent_version}" \
IMG_OS_VERSION="${img_os_version}" \ IMG_OS_VERSION="${img_os_version}" \
DISTRO_ROOTFS="${tmp_dir}/rootfs-image" ROOTFS_BUILD_DEST="${tmp_dir}/rootfs-image"
} }
create_tarball() { create_tarball() {
@@ -113,7 +113,7 @@ main() {
img_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version" "${kata_version}") img_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version" "${kata_version}")
#initrd information #initrd information
initrd_distro=$(get_from_kata_deps "assets.image.architecture.${arch_target}.name" "${kata_version}") initrd_distro=$(get_from_kata_deps "assets.initrd.architecture.${arch_target}.name" "${kata_version}")
#In old branches this is not defined, use a default #In old branches this is not defined, use a default
initrd_distro=${initrd_distro:-alpine} initrd_distro=${initrd_distro:-alpine}
initrd_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version" "${kata_version}") initrd_os_version=$(get_from_kata_deps "assets.image.architecture.${arch_target}.version" "${kata_version}")