Pin pip to 20.3.3 and disable tmpfs in DIB

[ta/build-tools.git] / build_images.sh

diff --git a/build_images.sh b/build_images.sh
index 0d7968b..281b166 100755 (executable)
--- 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