From 5e130bd06ce32884734be6f114466d8a83416369 Mon Sep 17 00:00:00 2001 From: Yang Jiao <72076317+YangJiao0817@users.noreply.github.com> Date: Tue, 1 Aug 2023 11:52:33 +0800 Subject: [PATCH] Bump up photon version from 4.0 to 5.0 (#19006) Signed-off-by: Yang Jiao --- make/photon/core/Dockerfile.base | 2 +- make/photon/db/Dockerfile.base | 10 ++++++---- 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/portal/Dockerfile.base | 2 +- make/photon/prepare/Dockerfile.base | 2 +- make/photon/redis/Dockerfile.base | 5 ++++- make/photon/registry/Dockerfile.base | 4 ++-- make/photon/registryctl/Dockerfile.base | 2 +- make/photon/trivy-adapter/Dockerfile.base | 2 +- 12 files changed, 21 insertions(+), 16 deletions(-) diff --git a/make/photon/core/Dockerfile.base b/make/photon/core/Dockerfile.base index 437fed7a9..a6c7f097c 100644 --- 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 index ed84a4879..a32c0d65e 100644 --- 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 index 437fed7a9..a6c7f097c 100644 --- 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 index 93d962863..7157c6c59 100644 --- 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 index 58937c443..ab20227b6 100644 --- 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 index 0c6ddeb1a..d6a18e543 100644 --- 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 index cf9d5af89..7d078696a 100644 --- 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 index 188c0ad3b..e88bbb7da 100644 --- 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 index 3334a6182..331306bd8 100644 --- 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 index 432a0f33f..3c4a465e6 100644 --- 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 \ No newline at end of file + && 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 index cd8143909..09809d6d4 100644 --- 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 index 8a774d2de..41a6bb740 100644 --- 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 \