X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fbuild-tools.git;a=blobdiff_plain;f=build_images.sh;fp=build_images.sh;h=66ef1534edfd3d5f2a8181b8d37138ada2179bc0;hp=0d7968b04dda27861789459fbad40f7c719ecd54;hb=fddfaa079633ecaba7fa6f5d375251b48c116bd1;hpb=9c647747fb6487004d7952e419d71aa8e2008bda diff --git a/build_images.sh b/build_images.sh index 0d7968b..66ef153 100755 --- a/build_images.sh +++ b/build_images.sh @@ -54,8 +54,11 @@ source $scriptdir/lib.sh _initialize_work_dirs -dib_patch="$scriptdir/docker-context/Dockerfile-dib.$(uname -m).patch" -if [ -e "${dib_patch}" ]; then patch "$scriptdir/docker-context/Dockerfile-dib" "${dib_patch}"; fi +dib_file="${scriptdir}/docker-context/Dockerfile-dib" +dib_patch="${dib_file}.$(uname -m).patch" +if [ -e "${dib_patch}" ] && ! patch -R --dry-run "${dib_file}" "${dib_patch}"; then + patch "${dib_file}" "${dib_patch}" +fi docker build -f $scriptdir/docker-context/Dockerfile-dib -t dib $scriptdir/docker-context docker build -f $scriptdir/docker-context/Dockerfile-buildtools -t buildtools $scriptdir/docker-context