From 535e7cadd5e3f7723e4df11df8b1febbd54df872 Mon Sep 17 00:00:00 2001 From: yixingj Date: Mon, 23 Oct 2017 12:02:22 +0800 Subject: [PATCH 1/2] Update OSS in rsyslog images 1> change to new photon base images 2> update OSS to latest --- make/common/rsyslog/Dockerfile | 8 +++++--- make/photon/log/Dockerfile | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/make/common/rsyslog/Dockerfile b/make/common/rsyslog/Dockerfile index 40ba5a269..51516f7cf 100644 --- a/make/common/rsyslog/Dockerfile +++ b/make/common/rsyslog/Dockerfile @@ -1,9 +1,11 @@ -FROM library/photon:1.0 +FROM vmware/photon:1.0-20170928 #base image for rsyslog base on photon -RUN tdnf install -y cronie rsyslog shadow tar gzip \ +RUN tdnf distro-sync -y \ + && tdnf install -y cronie rsyslog shadow tar gzip \ && mkdir /etc/rsyslog.d/ \ && mkdir /var/spool/rsyslog \ && groupadd syslog \ - && useradd -g syslog syslog + && useradd -g syslog syslog \ + && tdnf clean all diff --git a/make/photon/log/Dockerfile b/make/photon/log/Dockerfile index af0d78da9..635a81c68 100644 --- a/make/photon/log/Dockerfile +++ b/make/photon/log/Dockerfile @@ -1,4 +1,4 @@ -FROM vmware/rsyslog-photon:8.15.0 +FROM vmware/rsyslog-photon:8.15.0-6 ADD make/common/log/rsyslog.conf /etc/rsyslog.conf From 20929350b12adbf8bdad78d242031ed70c53fa01 Mon Sep 17 00:00:00 2001 From: yixingj Date: Mon, 23 Oct 2017 16:37:28 +0800 Subject: [PATCH 2/2] Update OSS in rsyslog images 1> change to new photon base images 2> update OSS to latest --- make/common/rsyslog/Dockerfile | 2 +- make/photon/log/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/make/common/rsyslog/Dockerfile b/make/common/rsyslog/Dockerfile index 51516f7cf..484f03594 100644 --- a/make/common/rsyslog/Dockerfile +++ b/make/common/rsyslog/Dockerfile @@ -1,4 +1,4 @@ -FROM vmware/photon:1.0-20170928 +FROM vmware/photon:1.0 #base image for rsyslog base on photon diff --git a/make/photon/log/Dockerfile b/make/photon/log/Dockerfile index 635a81c68..af0d78da9 100644 --- a/make/photon/log/Dockerfile +++ b/make/photon/log/Dockerfile @@ -1,4 +1,4 @@ -FROM vmware/rsyslog-photon:8.15.0-6 +FROM vmware/rsyslog-photon:8.15.0 ADD make/common/log/rsyslog.conf /etc/rsyslog.conf