From d03a29e53127c4b9c24a255f637bfdbc44b46787 Mon Sep 17 00:00:00 2001 From: Wang Yan Date: Wed, 31 Mar 2021 13:25:26 +0800 Subject: [PATCH] bump up photon to 4.0 Signed-off-by: Wang Yan --- make/photon/chartserver/Dockerfile.base | 2 +- make/photon/core/Dockerfile.base | 2 +- make/photon/db/Dockerfile.base | 2 +- make/photon/exporter/Dockerfile.base | 2 +- make/photon/jobservice/Dockerfile.base | 2 +- make/photon/log/Dockerfile.base | 2 +- make/photon/nginx/Dockerfile.base | 2 +- make/photon/notary-server/Dockerfile.base | 2 +- make/photon/notary-signer/Dockerfile.base | 2 +- make/photon/portal/Dockerfile.base | 2 +- make/photon/prepare/Dockerfile.base | 2 +- make/photon/redis/Dockerfile.base | 2 +- make/photon/registry/Dockerfile.base | 2 +- make/photon/registryctl/Dockerfile.base | 2 +- make/photon/trivy-adapter/Dockerfile.base | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/make/photon/chartserver/Dockerfile.base b/make/photon/chartserver/Dockerfile.base index 91db6f5ef..890ba6e2f 100644 --- a/make/photon/chartserver/Dockerfile.base +++ b/make/photon/chartserver/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y shadow >>/dev/null\ && tdnf clean all \ diff --git a/make/photon/core/Dockerfile.base b/make/photon/core/Dockerfile.base index dd1a383a1..437fed7a9 100644 --- a/make/photon/core/Dockerfile.base +++ b/make/photon/core/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y tzdata shadow >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/db/Dockerfile.base b/make/photon/db/Dockerfile.base index 3f8e6fdb6..29ff5bd40 100644 --- a/make/photon/db/Dockerfile.base +++ b/make/photon/db/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 ENV PGDATA /var/lib/postgresql/data diff --git a/make/photon/exporter/Dockerfile.base b/make/photon/exporter/Dockerfile.base index dd1a383a1..437fed7a9 100644 --- a/make/photon/exporter/Dockerfile.base +++ b/make/photon/exporter/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y tzdata shadow >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/jobservice/Dockerfile.base b/make/photon/jobservice/Dockerfile.base index a51f56ba8..93d962863 100644 --- a/make/photon/jobservice/Dockerfile.base +++ b/make/photon/jobservice/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y tzdata shadow >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/log/Dockerfile.base b/make/photon/log/Dockerfile.base index cb3dba297..58937c443 100644 --- a/make/photon/log/Dockerfile.base +++ b/make/photon/log/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y cronie rsyslog logrotate shadow tar gzip sudo >> /dev/null\ && mkdir /var/spool/rsyslog \ diff --git a/make/photon/nginx/Dockerfile.base b/make/photon/nginx/Dockerfile.base index 4980c7dd5..6c8949537 100644 --- a/make/photon/nginx/Dockerfile.base +++ b/make/photon/nginx/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y nginx shadow >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/notary-server/Dockerfile.base b/make/photon/notary-server/Dockerfile.base index d74e49389..2d9211479 100644 --- a/make/photon/notary-server/Dockerfile.base +++ b/make/photon/notary-server/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y shadow >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/notary-signer/Dockerfile.base b/make/photon/notary-signer/Dockerfile.base index d74e49389..2d9211479 100644 --- a/make/photon/notary-signer/Dockerfile.base +++ b/make/photon/notary-signer/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y shadow >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/portal/Dockerfile.base b/make/photon/portal/Dockerfile.base index 9566c3832..33eaf9a57 100644 --- a/make/photon/portal/Dockerfile.base +++ b/make/photon/portal/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y nginx shadow >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/prepare/Dockerfile.base b/make/photon/prepare/Dockerfile.base index c8a1f6bf5..6c705bb26 100644 --- a/make/photon/prepare/Dockerfile.base +++ b/make/photon/prepare/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y python3 python3-pip httpd && tdnf clean all RUN pip3 install setuptools && pip3 install pipenv==2018.11.26 diff --git a/make/photon/redis/Dockerfile.base b/make/photon/redis/Dockerfile.base index b0970b4ef..3334a6182 100644 --- a/make/photon/redis/Dockerfile.base +++ b/make/photon/redis/Dockerfile.base @@ -1,3 +1,3 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y redis && tdnf clean all diff --git a/make/photon/registry/Dockerfile.base b/make/photon/registry/Dockerfile.base index b0a9e590c..432a0f33f 100644 --- a/make/photon/registry/Dockerfile.base +++ b/make/photon/registry/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y shadow >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/registryctl/Dockerfile.base b/make/photon/registryctl/Dockerfile.base index e09ece073..cd8143909 100644 --- a/make/photon/registryctl/Dockerfile.base +++ b/make/photon/registryctl/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y shadow >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/trivy-adapter/Dockerfile.base b/make/photon/trivy-adapter/Dockerfile.base index 52cc63de0..8a774d2de 100644 --- a/make/photon/trivy-adapter/Dockerfile.base +++ b/make/photon/trivy-adapter/Dockerfile.base @@ -1,4 +1,4 @@ -FROM photon:2.0 +FROM photon:4.0 RUN tdnf install -y rpm shadow >> /dev/null \ && tdnf clean all \