From 07d1c7c9684e12346c679be34c2f0b6e84135f1e Mon Sep 17 00:00:00 2001 From: "Liu, Jianjun" Date: Mon, 8 Jul 2019 00:30:15 +0000 Subject: [PATCH] Hide the expected warning msg When removing the duplicated file and directory via rm -d, if it's a non-empty directory, it will prompt the warning message that the directory could not be removed becuase it is not empty. This is as expectation, as there are other files under the same diretory and we need to keep them. Hide these warning message to avoid confusion. Signed-off-by: Liu, Jianjun --- cassandra/Dockerfile | 2 +- cgit/Dockerfile | 2 +- elasticsearch/Dockerfile | 2 +- flink/Dockerfile | 2 +- golang/Dockerfile | 2 +- haproxy/Dockerfile | 2 +- httpd/Dockerfile | 2 +- iperf/Dockerfile | 2 +- mariadb/Dockerfile | 2 +- memcached/Dockerfile | 2 +- nginx/Dockerfile | 2 +- node/Dockerfile | 2 +- openjdk/Dockerfile | 2 +- perl/Dockerfile | 2 +- php-fpm/Dockerfile | 2 +- php/Dockerfile | 2 +- postgres/Dockerfile | 2 +- python/Dockerfile | 2 +- rabbitmq/Dockerfile | 2 +- redis/Dockerfile | 2 +- ruby/Dockerfile | 2 +- tensorflow/Dockerfile | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/cassandra/Dockerfile b/cassandra/Dockerfile index 2562fc1..e183fec 100644 --- a/cassandra/Dockerfile +++ b/cassandra/Dockerfile @@ -25,7 +25,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest MAINTAINER wang.jue@intel.com diff --git a/cgit/Dockerfile b/cgit/Dockerfile index df59377..ebe9c11 100644 --- a/cgit/Dockerfile +++ b/cgit/Dockerfile @@ -25,7 +25,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/httpd:latest diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 482fcce..a14ea6c 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/flink/Dockerfile b/flink/Dockerfile index 62d25f3..df23304 100644 --- a/flink/Dockerfile +++ b/flink/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/golang/Dockerfile b/golang/Dockerfile index 1a840c0..8fa94e1 100644 --- a/golang/Dockerfile +++ b/golang/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/haproxy/Dockerfile b/haproxy/Dockerfile index 351f5dc..33f54f7 100644 --- a/haproxy/Dockerfile +++ b/haproxy/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/httpd/Dockerfile b/httpd/Dockerfile index b6f9b1b..928e822 100644 --- a/httpd/Dockerfile +++ b/httpd/Dockerfile @@ -25,7 +25,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest MAINTAINER qi.zheng@intel.com diff --git a/iperf/Dockerfile b/iperf/Dockerfile index 2d949e6..2839ebf 100644 --- a/iperf/Dockerfile +++ b/iperf/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/mariadb/Dockerfile b/mariadb/Dockerfile index 8ab2cee..b6d4cb7 100644 --- a/mariadb/Dockerfile +++ b/mariadb/Dockerfile @@ -27,7 +27,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest MAINTAINER qi.zheng@intel.com diff --git a/memcached/Dockerfile b/memcached/Dockerfile index 0d30045..63bd9b4 100644 --- a/memcached/Dockerfile +++ b/memcached/Dockerfile @@ -25,7 +25,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest MAINTAINER qi.zheng@intel.com diff --git a/nginx/Dockerfile b/nginx/Dockerfile index 3d16111..19e899e 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -25,7 +25,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest MAINTAINER bin.yang@intel.com diff --git a/node/Dockerfile b/node/Dockerfile index e5c232d..dda50bd 100644 --- a/node/Dockerfile +++ b/node/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/openjdk/Dockerfile b/openjdk/Dockerfile index c289fa2..4f703cf 100644 --- a/openjdk/Dockerfile +++ b/openjdk/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/perl/Dockerfile b/perl/Dockerfile index db2dd78..99b9be3 100644 --- a/perl/Dockerfile +++ b/perl/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile index 7b95fe5..e772088 100644 --- a/php-fpm/Dockerfile +++ b/php-fpm/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/php/Dockerfile b/php/Dockerfile index a93fa46..e4bfa4e 100644 --- a/php/Dockerfile +++ b/php/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/postgres/Dockerfile b/postgres/Dockerfile index c3ec0b4..920a435 100644 --- a/postgres/Dockerfile +++ b/postgres/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/python/Dockerfile b/python/Dockerfile index cbda610..4363941 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/rabbitmq/Dockerfile b/rabbitmq/Dockerfile index 65714c2..8f91196 100644 --- a/rabbitmq/Dockerfile +++ b/rabbitmq/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/redis/Dockerfile b/redis/Dockerfile index fb23ea3..bfebb45 100644 --- a/redis/Dockerfile +++ b/redis/Dockerfile @@ -25,7 +25,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest MAINTAINER qi.zheng@intel.com diff --git a/ruby/Dockerfile b/ruby/Dockerfile index b51b7a3..9d1115b 100644 --- a/ruby/Dockerfile +++ b/ruby/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest diff --git a/tensorflow/Dockerfile b/tensorflow/Dockerfile index f5052b3..46277df 100644 --- a/tensorflow/Dockerfile +++ b/tensorflow/Dockerfile @@ -26,7 +26,7 @@ RUN source /os-release && \ 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 + find os_core_install | sed -e 's/os_core_install/install_root/' | xargs rm -d &> /dev/null || true FROM clearlinux/os-core:latest