From 063e44c486d06df7eb956b09630ed190bdccd21b Mon Sep 17 00:00:00 2001 From: wangyan Date: Tue, 7 Aug 2018 22:58:01 -0700 Subject: [PATCH] Remove the tdnf error eater in docker files --- make/photon/registryctl/Dockerfile | 2 +- tools/migration/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make/photon/registryctl/Dockerfile b/make/photon/registryctl/Dockerfile index 811e24662..9e6e7e2a9 100644 --- a/make/photon/registryctl/Dockerfile +++ b/make/photon/registryctl/Dockerfile @@ -2,7 +2,7 @@ FROM photon:1.0 MAINTAINER wangyan@vmware.com -RUN tdnf distro-sync -y || echo \ +RUN tdnf distro-sync -y \ && tdnf erase vim -y \ && tdnf install sudo -y >> /dev/null\ && tdnf clean all \ diff --git a/tools/migration/Dockerfile b/tools/migration/Dockerfile index bdbb95454..713b11223 100644 --- a/tools/migration/Dockerfile +++ b/tools/migration/Dockerfile @@ -3,7 +3,7 @@ FROM photon:1.0 ENV PGDATA /var/lib/postgresql/data ## have both mysql and pgsql installed. -RUN tdnf distro-sync -y || echo \ +RUN tdnf distro-sync -y \ && tdnf install -y sed shadow procps-ng gawk gzip sudo net-tools >> /dev/null\ && groupadd -r -g 10000 mysql && useradd --no-log-init -r -g 10000 -u 10000 mysql \ && tdnf install -y mariadb-server mariadb mariadb-devel python2 python2-devel python-pip gcc \