only copy delta files when multistage build

For some Host OS configuration with redirect_dir on,
extra data are saved on the upper layer when the same
file exists on different layers. To minimize docker
image size, remove the overlapped files before copy,
when cgit, httpd, mariadb, memcached, nginx and
postgres.

Signed-off-by: Liu, Jianjun <jianjun.liu@intel.com>

cgit/Dockerfile

@@ -18,6 +18,15 @@ RUN source /os-release && \
     --bundles=sudo,curl,scm-server --no-scripts \
     && rm -rf /install_root/var/lib/swupd/*
 
+# For some Host OS configuration with redirect_dir on,
+# extra data are saved on the upper layer when the same
+# file exists on different layers. To minimize docker
+# image size, remove the overlapped files before copy.
+RUN mkdir /os_core_install
+COPY --from=clearlinux/os-core:latest / /os_core_install/
+RUN cd / && \
+    find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d || true
+
 FROM clearlinux/httpd:latest
 
 COPY --from=builder /install_root /

httpd/Dockerfile

@@ -18,6 +18,15 @@ RUN source /os-release && \
     --bundles=httpd --no-scripts \
     && rm -rf /install_root/var/lib/swupd/*
 
+# For some Host OS configuration with redirect_dir on,
+# extra data are saved on the upper layer when the same
+# file exists on different layers. To minimize docker
+# image size, remove the overlapped files before copy.
+RUN mkdir /os_core_install
+COPY --from=clearlinux/os-core:latest / /os_core_install/
+RUN cd / && \
+    find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d || true
+
 FROM clearlinux/os-core:latest
 MAINTAINER qi.zheng@intel.com
 

mariadb/Dockerfile

@@ -20,6 +20,15 @@ RUN source /os-release && \
     --bundles=mariadb --no-scripts \
     && rm -rf /install_root/var/lib/swupd/*
 
+# For some Host OS configuration with redirect_dir on,
+# extra data are saved on the upper layer when the same
+# file exists on different layers. To minimize docker
+# image size, remove the overlapped files before copy.
+RUN mkdir /os_core_install
+COPY --from=clearlinux/os-core:latest / /os_core_install/
+RUN cd / && \
+    find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d || true
+
 FROM clearlinux/os-core:latest
 MAINTAINER qi.zheng@intel.com
 

memcached/Dockerfile

@@ -18,6 +18,15 @@ RUN source /os-release && \
     --bundles=memcached --no-scripts \
     && rm -rf /install_root/var/lib/swupd/*
 
+# For some Host OS configuration with redirect_dir on,
+# extra data are saved on the upper layer when the same
+# file exists on different layers. To minimize docker
+# image size, remove the overlapped files before copy.
+RUN mkdir /os_core_install
+COPY --from=clearlinux/os-core:latest / /os_core_install/
+RUN cd / && \
+    find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d || true
+
 FROM clearlinux/os-core:latest
 MAINTAINER qi.zheng@intel.com
 

nginx/Dockerfile

@@ -18,6 +18,15 @@ RUN source /os-release && \
     --bundles=nginx --no-scripts \
     && rm -rf /install_root/var/lib/swupd/*
 
+# For some Host OS configuration with redirect_dir on,
+# extra data are saved on the upper layer when the same
+# file exists on different layers. To minimize docker
+# image size, remove the overlapped files before copy.
+RUN mkdir /os_core_install
+COPY --from=clearlinux/os-core:latest / /os_core_install/
+RUN cd / && \
+    find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d || true
+
 FROM clearlinux/os-core:latest
 MAINTAINER bin.yang@intel.com
 

postgres/Dockerfile

@@ -19,6 +19,15 @@ RUN source /os-release && \
     --path /install_root --statedir /swupd-state \
     --bundles=postgresql --no-scripts
 
+# For some Host OS configuration with redirect_dir on,
+# extra data are saved on the upper layer when the same
+# file exists on different layers. To minimize docker
+# image size, remove the overlapped files before copy.
+RUN mkdir /os_core_install
+COPY --from=clearlinux/os-core:latest / /os_core_install/
+RUN cd / && \
+    find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d || true
+
 FROM clearlinux/os-core:latest
 
 COPY --from=builder /install_root /