X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ta%2Fbuild-tools.git;a=blobdiff_plain;f=build_images.sh;h=281b166e1c071417d09bc7957cd5915ad3e82ffa;hp=0d7968b04dda27861789459fbad40f7c719ecd54;hb=HEAD;hpb=eb6df414a1b5d1b7b67d3dd5f9b7d0529b8cf5fc diff --git a/build_images.sh b/build_images.sh index 0d7968b..281b166 100755 --- a/build_images.sh +++ b/build_images.sh @@ -54,11 +54,14 @@ 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 +docker build --network=host -f $scriptdir/docker-context/Dockerfile-dib -t dib $scriptdir/docker-context +docker build --network=host -f $scriptdir/docker-context/Dockerfile-buildtools -t buildtools $scriptdir/docker-context # Create manifest RPM $LIBDIR/create_manifest_rpm.sh