1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00

Merge pull request #14369 from maximkulkin/14123-dockerize-disk-with-non-en-locale

Fix dockerize-disk.sh working in non-en locale
This commit is contained in:
Jessie Frazelle 2015-07-07 17:51:29 -07:00
commit 16f8afb451

View file

@ -74,7 +74,7 @@ mount -t aufs -o "br=$builddir/diff=rw${base_image_mounts},dio,xino=/dev/shm/auf
# Update files
cd $builddir
diff -rq disk_image workdir \
LC_ALL=C diff -rq disk_image workdir \
| sed -re "s|Only in workdir(.*?): |DEL \1/|g;s|Only in disk_image(.*?): |ADD \1/|g;s|Files disk_image/(.+) and workdir/(.+) differ|UPDATE /\1|g" \
| while read action entry; do
case "$action" in