Bump up photon version from 4.0 to 5.0

Signed-off-by: Yang Jiao <[email protected]>
goharbor · Aug 1, 2023 · 2b7b24d · 2b7b24d
1 parent 854e029
commit 2b7b24d
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 16 deletions.
diff --git a/make/photon/core/Dockerfile.base b/make/photon/core/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM photon:5.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,11 +1,13 @@
-FROM photon:4.0
+FROM photon:5.0
 
 ENV PGDATA /var/lib/postgresql/data
 
-RUN tdnf install -y postgresql13 >> /dev/null
-RUN tdnf install -y shadow gzip postgresql findutils bc >> /dev/null \
+RUN tdnf install -y shadow >> /dev/null \
     && groupadd -r postgres --gid=999 \
-    && useradd -m -r -g postgres --uid=999 postgres \
+    && useradd -m -r -g postgres --uid=999 postgres
+
+RUN tdnf install -y postgresql13-server >> /dev/null
+RUN tdnf install -y gzip postgresql14-server findutils bc >> /dev/null \
     && mkdir -p /docker-entrypoint-initdb.d \
     && mkdir -p /run/postgresql \
     && chown -R postgres:postgres /run/postgresql \

diff --git a/make/photon/exporter/Dockerfile.base b/make/photon/exporter/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM photon:5.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:4.0
+FROM photon:5.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:4.0
+FROM photon:5.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:4.0
+FROM photon:5.0
 
 RUN tdnf install -y nginx 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:4.0
+FROM photon:5.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:4.0
+FROM photon:5.0
 
 RUN tdnf install -y python3 python3-pip python3-PyYAML python3-jinja2 && tdnf clean all
 RUN pip3 install pipenv==2022.1.8

diff --git a/make/photon/redis/Dockerfile.base b/make/photon/redis/Dockerfile.base
@@ -1,3 +1,6 @@
-FROM photon:4.0
+FROM photon:5.0
 
+RUN tdnf install -y shadow >> /dev/null \
+    && groupadd -g 999 redis \
+    && useradd -u 999 -g 999 -c "Redis Database Server" -d /var/lib/redis -s /sbin/nologin -m redis
 RUN tdnf install -y redis && tdnf clean all
diff --git a/make/photon/registry/Dockerfile.base b/make/photon/registry/Dockerfile.base
@@ -1,6 +1,6 @@
-FROM photon:4.0
+FROM photon:5.0
 
 RUN tdnf install -y shadow >> /dev/null \
     && tdnf clean all \
     && mkdir -p /etc/registry \
-    && groupadd -r -g 10000 harbor && useradd --no-log-init -m -g 10000 -u 10000 harbor
+    && groupadd -r -g 10000 harbor && useradd --no-log-init -m -g 10000 -u 10000 harbor
diff --git a/make/photon/registryctl/Dockerfile.base b/make/photon/registryctl/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM photon:5.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:4.0
+FROM photon:5.0
 
 RUN tdnf install -y rpm shadow >> /dev/null \
     && tdnf clean all \