From 5b6c75f98672d4a19ba439d6a0cf006e5e288c97 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Thu, 2 Apr 2015 18:40:27 -0700 Subject: [PATCH] And re-tabify that (to make previous easier to review) --- build/common.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/build/common.sh b/build/common.sh index 238a40ed451..915fe47e203 100644 --- a/build/common.sh +++ b/build/common.sh @@ -604,18 +604,18 @@ function kube::release::create_docker_images_for_server() { kube::log::status "Starting Docker build for image: ${binary_name}" ( - local docker_file_path="$1/${binary_name}.Dockerfile" - local binary_file_path="$1/${binary_name}" - if [ -f ${docker_file_path} ]; then + local docker_file_path="$1/${binary_name}.Dockerfile" + local binary_file_path="$1/${binary_name}" + if [ -f ${docker_file_path} ]; then + rm ${docker_file_path} + fi + printf " FROM scratch \n ADD ${binary_name} /${binary_name} \n ENTRYPOINT [ \"/${binary_name}\" ]\n" >> ${docker_file_path} + local md5_sum=$(kube::release::md5 ${binary_file_path}) + local docker_image_tag=gcr.io/google_containers/$binary_name:$md5_sum + docker build -q -f "${docker_file_path}" -t "${docker_image_tag}" ${1} >/dev/null + docker save ${docker_image_tag} > ${1}/${binary_name}.tar + echo $md5_sum > ${1}/${binary_name}.docker_tag rm ${docker_file_path} - fi - printf " FROM scratch \n ADD ${binary_name} /${binary_name} \n ENTRYPOINT [ \"/${binary_name}\" ]\n" >> ${docker_file_path} - local md5_sum=$(kube::release::md5 ${binary_file_path}) - local docker_image_tag=gcr.io/google_containers/$binary_name:$md5_sum - docker build -q -f "${docker_file_path}" -t "${docker_image_tag}" ${1} >/dev/null - docker save ${docker_image_tag} > ${1}/${binary_name}.tar - echo $md5_sum > ${1}/${binary_name}.docker_tag - rm ${docker_file_path} ) & done