From a5615f74f98be96464cd1c073f4aa64120dffa96 Mon Sep 17 00:00:00 2001 From: Alexey Pustovalov Date: Thu, 27 Aug 2020 15:19:48 -0400 Subject: [PATCH] Fixed image building on CentOS --- agent/centos/Dockerfile | 2 +- agent/ubuntu/Dockerfile | 2 +- proxy-mysql/centos/Dockerfile | 2 +- proxy-mysql/ubuntu/Dockerfile | 2 +- proxy-sqlite3/centos/Dockerfile | 2 +- proxy-sqlite3/ubuntu/Dockerfile | 2 +- server-mysql/centos/Dockerfile | 2 +- server-mysql/ubuntu/Dockerfile | 2 +- server-pgsql/centos/Dockerfile | 2 +- server-pgsql/ubuntu/Dockerfile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/agent/centos/Dockerfile b/agent/centos/Dockerfile index b42644bc7..342cdaa84 100644 --- a/agent/centos/Dockerfile +++ b/agent/centos/Dockerfile @@ -39,7 +39,7 @@ RUN set -eux && \ gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \ done && \ gpg --batch --verify /tmp/tini.asc /sbin/tini && \ - rm -r "$GNUPGHOME" /tmp/tini.asc && \ + rm -rf "$GNUPGHOME" /tmp/tini.asc && \ chmod +x /sbin/tini && \ yum -y clean all && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ diff --git a/agent/ubuntu/Dockerfile b/agent/ubuntu/Dockerfile index 0a5c80e60..7f90c66b6 100644 --- a/agent/ubuntu/Dockerfile +++ b/agent/ubuntu/Dockerfile @@ -47,7 +47,7 @@ RUN set -eux && \ gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \ done && \ gpg --batch --verify /tmp/tini.asc /sbin/tini && \ - rm -r "$GNUPGHOME" /tmp/tini.asc && \ + rm -rf "$GNUPGHOME" /tmp/tini.asc && \ chmod +x /sbin/tini && \ apt-get -y purge curl gpg dirmngr gpg-agent && \ apt-get -y autoremove && \ diff --git a/proxy-mysql/centos/Dockerfile b/proxy-mysql/centos/Dockerfile index 164a23c98..7f699bbd8 100644 --- a/proxy-mysql/centos/Dockerfile +++ b/proxy-mysql/centos/Dockerfile @@ -54,7 +54,7 @@ RUN set -eux && \ gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \ done && \ gpg --batch --verify /tmp/tini.asc /sbin/tini && \ - rm -r "$GNUPGHOME" /tmp/tini.asc && \ + rm -rf "$GNUPGHOME" /tmp/tini.asc && \ chmod +x /sbin/tini && \ yum -y clean all && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ diff --git a/proxy-mysql/ubuntu/Dockerfile b/proxy-mysql/ubuntu/Dockerfile index 2b3faecd6..bddb8d536 100644 --- a/proxy-mysql/ubuntu/Dockerfile +++ b/proxy-mysql/ubuntu/Dockerfile @@ -63,7 +63,7 @@ RUN set -eux && \ gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \ done && \ gpg --batch --verify /tmp/tini.asc /sbin/tini && \ - rm -r "$GNUPGHOME" /tmp/tini.asc && \ + rm -rf "$GNUPGHOME" /tmp/tini.asc && \ chmod +x /sbin/tini && \ apt-get -y purge curl gpg dirmngr gpg-agent && \ apt-get -y autoremove && \ diff --git a/proxy-sqlite3/centos/Dockerfile b/proxy-sqlite3/centos/Dockerfile index 997c2f68c..544252e4c 100644 --- a/proxy-sqlite3/centos/Dockerfile +++ b/proxy-sqlite3/centos/Dockerfile @@ -53,7 +53,7 @@ RUN set -eux && \ gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \ done && \ gpg --batch --verify /tmp/tini.asc /sbin/tini && \ - rm -r "$GNUPGHOME" /tmp/tini.asc && \ + rm -rf "$GNUPGHOME" /tmp/tini.asc && \ chmod +x /sbin/tini && \ yum -y clean all && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ diff --git a/proxy-sqlite3/ubuntu/Dockerfile b/proxy-sqlite3/ubuntu/Dockerfile index bccf9ff3d..244a85946 100644 --- a/proxy-sqlite3/ubuntu/Dockerfile +++ b/proxy-sqlite3/ubuntu/Dockerfile @@ -61,7 +61,7 @@ RUN set -eux && \ gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \ done && \ gpg --batch --verify /tmp/tini.asc /sbin/tini && \ - rm -r "$GNUPGHOME" /tmp/tini.asc && \ + rm -rf "$GNUPGHOME" /tmp/tini.asc && \ chmod +x /sbin/tini && \ apt-get -y purge curl gpg dirmngr gpg-agent && \ apt-get -y autoremove && \ diff --git a/server-mysql/centos/Dockerfile b/server-mysql/centos/Dockerfile index 60776e98d..ec931325a 100644 --- a/server-mysql/centos/Dockerfile +++ b/server-mysql/centos/Dockerfile @@ -59,7 +59,7 @@ RUN set -eux && \ gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \ done && \ gpg --batch --verify /tmp/tini.asc /sbin/tini && \ - rm -r "$GNUPGHOME" /tmp/tini.asc && \ + rm -rf "$GNUPGHOME" /tmp/tini.asc && \ chmod +x /sbin/tini && \ yum -y clean all && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ diff --git a/server-mysql/ubuntu/Dockerfile b/server-mysql/ubuntu/Dockerfile index cb75ecedc..8710ec7f4 100644 --- a/server-mysql/ubuntu/Dockerfile +++ b/server-mysql/ubuntu/Dockerfile @@ -68,7 +68,7 @@ RUN set -eux && \ gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \ done && \ gpg --batch --verify /tmp/tini.asc /sbin/tini && \ - rm -r "$GNUPGHOME" /tmp/tini.asc && \ + rm -rf "$GNUPGHOME" /tmp/tini.asc && \ chmod +x /sbin/tini && \ apt-get -y purge curl gpg dirmngr gpg-agent && \ apt-get -y autoremove && \ diff --git a/server-pgsql/centos/Dockerfile b/server-pgsql/centos/Dockerfile index ed43ccfbc..f6253dff7 100644 --- a/server-pgsql/centos/Dockerfile +++ b/server-pgsql/centos/Dockerfile @@ -60,7 +60,7 @@ RUN set -eux && \ gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \ done && \ gpg --batch --verify /tmp/tini.asc /sbin/tini && \ - rm -r "$GNUPGHOME" /tmp/tini.asc && \ + rm -rf "$GNUPGHOME" /tmp/tini.asc && \ chmod +x /sbin/tini && \ yum -y clean all && \ rm -rf /var/cache/yum /var/lib/yum/yumdb/* /usr/lib/udev/hwdb.d/* && \ diff --git a/server-pgsql/ubuntu/Dockerfile b/server-pgsql/ubuntu/Dockerfile index be27d9601..04442a0b5 100644 --- a/server-pgsql/ubuntu/Dockerfile +++ b/server-pgsql/ubuntu/Dockerfile @@ -68,7 +68,7 @@ RUN set -eux && \ gpg --keyserver "$server" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && break || : ; \ done && \ gpg --batch --verify /tmp/tini.asc /sbin/tini && \ - rm -r "$GNUPGHOME" /tmp/tini.asc && \ + rm -rf "$GNUPGHOME" /tmp/tini.asc && \ chmod +x /sbin/tini && \ apt-get -y purge curl gpg dirmngr gpg-agent && \ apt-get -y autoremove && \