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

obs: build-from-docker.sh: Not build image if already craeted.

Browse Source 
Accelerate the build process by not creating image again.

Add DEBUG flag to docker run.

Signed-off-by: Jose Carlos Venegas Munoz <jose.carlos.venegas.munoz@intel.com>
This commit is contained in:
Jose Carlos Venegas Munoz 2018-08-13 13:18:38 -05:00
parent 9c64f571f6
commit bb889a464d
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
obs-packaging/build_from_docker.sh
View File

@ -38,6 +38,7 @@ docker_run(){
--env https_proxy="${https_proxy}" \ --env https_proxy="${https_proxy}" \
--env no_proxy="${no_proxy}" \ --env no_proxy="${no_proxy}" \
--env PUSH="${PUSH}" \ --env PUSH="${PUSH}" \
--env DEBUG="${DEBUG}" \
-v "${HOME}/.bashrc":/root/.bashrc \ -v "${HOME}/.bashrc":/root/.bashrc \
-v "$cache_dir":/var/tmp/osbuild-packagecache/ \ -v "$cache_dir":/var/tmp/osbuild-packagecache/ \
-v "$packaging_repo_dir":${packaging_repo_dir} \ -v "$packaging_repo_dir":${packaging_repo_dir} \
@ -61,7 +62,10 @@ main(){
[ -n "${branch}" ] || usage "missing branch" "1" [ -n "${branch}" ] || usage "missing branch" "1"
pushd "${script_dir}/kata-containers-image/" >> /dev/null pushd "${script_dir}/kata-containers-image/" >> /dev/null
echo "Building image" echo "Building image"
./build_image.sh image_tarball=$(find . -name 'kata-containers-'"${branch}"'-*.tar.gz')
[ -f "${image_tarball}" ] || "${script_dir}/../obs-packaging/kata-containers-image/build_image.sh" -v "${branch}"
image_tarball=$(find . -name 'kata-containers-'"${branch}"'-*.tar.gz')
[ -f "${image_tarball}" ] || die "image not found"
popd >> /dev/null popd >> /dev/null
sudo docker build \ sudo docker build \
--build-arg http_proxy="${http_proxy}" \ --build-arg http_proxy="${http_proxy}" \
@ -69,7 +73,7 @@ main(){
-t $obs_image "${script_dir}" -t $obs_image "${script_dir}"
#Create/update OBS repository for branch #Create/update OBS repository for branch
docker_run "${packaging_repo_dir}/obs-packaging/create-pkg-branch.sh ${branch}" #docker_run "${packaging_repo_dir}/obs-packaging/create-pkg-branch.sh ${branch}"
#Build all kata packages #Build all kata packages
docker_run "${packaging_repo_dir}/obs-packaging/build_all.sh ${branch}" docker_run "${packaging_repo_dir}/obs-packaging/build_all.sh ${branch}"
} }