ExternalVendorCode/OpenMTC
1
0
Fork 0
mirror of https://github.com/OpenMTC/OpenMTC.git synced 2024-12-18 20:47:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

enhances cleanup for building docker containers in error cases

Browse Source
This commit is contained in:
Christian Klopp 2018-06-12 14:29:42 +02:00
parent c2b47944b2
commit 531befbaf4
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
create-binary-docker
View File

@ -260,6 +260,14 @@ rm -f "${target_docker_binary}"
rm -f "${docker_tmp}/${name}-dependencies.txt" rm -f "${docker_tmp}/${name}-dependencies.txt"
${docker_cmd} rm -f ${build_container_name} &> /dev/null ${docker_cmd} rm -f ${build_container_name} &> /dev/null
printf "done\n" printf "done\n"
# remove dangling images
separator_line
printf "### Removing dangled images..."
for image in $(${docker_cmd} images -qa -f "dangling=true"); do
${docker_cmd} rmi -f ${image} > /dev/null
done
printf "done\n"
} }
trap cleanup SIGINT SIGTERM trap cleanup SIGINT SIGTERM
@ -391,7 +399,7 @@ printf "%s\n" $(get_requirements_from_setup_file) | tr " " "\n" > \
separator_line separator_line
printf "### Building %s-%s container...\n" ${name} ${machine} printf "### Building %s-%s container...\n" ${name} ${machine}
${docker_cmd} build -t ${target_docker_name} \ ${docker_cmd} build --force-rm -t ${target_docker_name} \
-f ${target_docker_file} ${docker_path} -f ${target_docker_file} ${docker_path}
if [ $? -gt 0 ]; then if [ $? -gt 0 ]; then
printf "### Building %s-%s container failed. Exiting now.\n" \ printf "### Building %s-%s container failed. Exiting now.\n" \
@ -405,15 +413,6 @@ printf "### Base %s-%s container built successfully.\n" ${name} ${machine}
# cleanup # cleanup
cleanup cleanup
##############################################################################
# remove dangling images
separator_line
printf "### Removing dangled images..."
for image in $(${docker_cmd} images -qa -f "dangling=true"); do
${docker_cmd} rmi -f ${image} > /dev/null
done
printf "done\n"
############################################################################## ##############################################################################
# example to run the docker file # example to run the docker file
#${docker_cmd} run --name test -d \ #${docker_cmd} run --name test -d \