Merge pull request #14551 from wy65701436/photon-4.0

[WIP]bump up photon to 4.0
goharbor · Apr 1, 2021 · 681b69a · 681b69a
2 parents b445683 + d03a29e
commit 681b69a
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
-FROM photon:2.0
+FROM photon:4.0
 
 RUN tdnf install -y rpm shadow >> /dev/null \
     && tdnf clean all \