From b560f6c061ae03121675ef7ababeb4783e72adfb Mon Sep 17 00:00:00 2001 From: wangyan Date: Tue, 19 Dec 2017 21:10:32 -0800 Subject: [PATCH] Remove the workaroud for avoiding photon distro-sync error --- make/photon/clair/Dockerfile | 2 +- make/photon/log/Dockerfile | 2 +- make/photon/mariadb/Dockerfile | 2 +- make/photon/nginx/Dockerfile | 2 +- make/photon/notary/server.Dockerfile | 2 +- make/photon/notary/signer.Dockerfile | 2 +- make/photon/postgresql/Dockerfile | 2 +- make/photon/registry/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/make/photon/clair/Dockerfile b/make/photon/clair/Dockerfile index 6bcde5f33..b62cc9e67 100644 --- a/make/photon/clair/Dockerfile +++ b/make/photon/clair/Dockerfile @@ -1,7 +1,7 @@ FROM vmware/photon:1.0 -RUN tdnf distro-sync -y || echo \ +RUN tdnf distro-sync -y \ && tdnf erase vim -y \ && tdnf install -y git shadow sudo bzr rpm xz python-xml \ && tdnf clean all \ diff --git a/make/photon/log/Dockerfile b/make/photon/log/Dockerfile index 18e33f457..1db6314b2 100644 --- a/make/photon/log/Dockerfile +++ b/make/photon/log/Dockerfile @@ -1,6 +1,6 @@ FROM vmware/photon:1.0 -RUN tdnf distro-sync -y || echo \ +RUN tdnf distro-sync -y \ && tdnf install -y cronie rsyslog logrotate shadow tar gzip sudo net-tools\ && mkdir /etc/rsyslog.d/ \ && mkdir /var/spool/rsyslog \ diff --git a/make/photon/mariadb/Dockerfile b/make/photon/mariadb/Dockerfile index d857810a5..a8cbb8821 100644 --- a/make/photon/mariadb/Dockerfile +++ b/make/photon/mariadb/Dockerfile @@ -2,7 +2,7 @@ FROM vmware/photon:1.0 #The Docker Daemon has to be running with storage backend btrfs when building the image -RUN tdnf distro-sync -y || echo \ +RUN tdnf distro-sync -y \ && tdnf install -y sed shadow procps-ng gawk gzip sudo net-tools \ && groupadd -r -g 10000 mysql && useradd --no-log-init -r -g 10000 -u 10000 mysql \ && tdnf install -y mariadb-server mariadb \ diff --git a/make/photon/nginx/Dockerfile b/make/photon/nginx/Dockerfile index 1c85bb5e6..9f6bd4353 100644 --- a/make/photon/nginx/Dockerfile +++ b/make/photon/nginx/Dockerfile @@ -1,6 +1,6 @@ FROM vmware/photon:1.0 -RUN tdnf distro-sync -y || echo \ +RUN tdnf distro-sync -y \ && tdnf install -y nginx \ && ln -sf /dev/stdout /var/log/nginx/access.log \ && ln -sf /dev/stderr /var/log/nginx/error.log \ diff --git a/make/photon/notary/server.Dockerfile b/make/photon/notary/server.Dockerfile index 9519dc412..bd9ff8db0 100644 --- a/make/photon/notary/server.Dockerfile +++ b/make/photon/notary/server.Dockerfile @@ -1,6 +1,6 @@ FROM vmware/photon:1.0 -RUN tdnf distro-sync -y || echo \ +RUN tdnf distro-sync -y \ && tdnf erase vim -y \ && tdnf install -y shadow sudo \ && tdnf clean all \ diff --git a/make/photon/notary/signer.Dockerfile b/make/photon/notary/signer.Dockerfile index 34544dfad..4977caf55 100644 --- a/make/photon/notary/signer.Dockerfile +++ b/make/photon/notary/signer.Dockerfile @@ -1,6 +1,6 @@ FROM vmware/photon:1.0 -RUN tdnf distro-sync -y || echo \ +RUN tdnf distro-sync -y \ && tdnf erase vim -y \ && tdnf install -y shadow sudo \ && tdnf clean all \ diff --git a/make/photon/postgresql/Dockerfile b/make/photon/postgresql/Dockerfile index f849234d4..37fbc1095 100644 --- a/make/photon/postgresql/Dockerfile +++ b/make/photon/postgresql/Dockerfile @@ -3,7 +3,7 @@ FROM vmware/photon:1.0 ENV PGDATA /var/lib/postgresql/data RUN touch /etc/localtime.bak \ - && tdnf distro-sync -y || echo \ + && tdnf distro-sync -y \ && tdnf install -y sed shadow gzip postgresql\ && groupadd -r postgres --gid=999 \ && useradd -r -g postgres --uid=999 postgres \ diff --git a/make/photon/registry/Dockerfile b/make/photon/registry/Dockerfile index 1b655f227..2e17a8447 100644 --- a/make/photon/registry/Dockerfile +++ b/make/photon/registry/Dockerfile @@ -3,7 +3,7 @@ FROM vmware/photon:1.0 MAINTAINER wangyan@vmware.com # The original script in the docker offical registry image. -RUN tdnf distro-sync -y || echo \ +RUN tdnf distro-sync -y \ && tdnf erase vim -y \ && tdnf install sudo -y \ && tdnf clean all \