bump up to photon:5.0 mainly to resolve /lib/libc.so.6: version `GLIB…

…C_2.34' not found use mariadb-18.2.6.tgz as the old one is 404 Signed-off-by: Shengwen Yu <yshengwen@vmware.com>
goharbor · Jul 8, 2024 · ac2ca43 · ac2ca43
1 parent a02a014
commit ac2ca43
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 17 deletions.
diff --git a/make/photon/chartserver/Dockerfile.base b/make/photon/chartserver/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM photon:5.0
 
 RUN tdnf install -y shadow sudo >>/dev/null\
     && tdnf clean all \

diff --git a/make/photon/clair-adapter/Dockerfile.base b/make/photon/clair-adapter/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM photon:5.0
 
 RUN tdnf install -y sudo >>/dev/null\
     && tdnf clean all \

diff --git a/make/photon/clair/Dockerfile.base b/make/photon/clair/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM photon:5.0
 
 RUN tdnf install -y git shadow sudo rpm xz python3-xml >>/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:4.0
+FROM photon:5.0
 
 RUN tdnf install sudo tzdata -y >> /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:4.0
+FROM photon:5.0
 
 ENV PGDATA /var/lib/postgresql/data
 

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 sudo tzdata -y >> /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/notary-server/Dockerfile.base b/make/photon/notary-server/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM photon:5.0
 
 RUN tdnf install -y shadow sudo \
     && 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:4.0
+FROM photon:5.0
 
 RUN tdnf install -y shadow sudo \
     && 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 \
     && tdnf install -y python3-pip python3-PyYAML python3-jinja2

diff --git a/make/photon/redis/Dockerfile.base b/make/photon/redis/Dockerfile.base
@@ -1,3 +1,3 @@
-FROM photon:4.0
+FROM photon:5.0
 
 RUN tdnf install -y redis sudo
diff --git a/make/photon/registry/Dockerfile.base b/make/photon/registry/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM photon:4.0
+FROM photon:5.0
 
 RUN tdnf install sudo -y >> /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:4.0
+FROM photon:5.0
 
 RUN tdnf install sudo -y >> /dev/null \
     && tdnf clean all \

diff --git a/tests/apitests/python/test_list_helm_charts.py b/tests/apitests/python/test_list_helm_charts.py
@@ -49,8 +49,8 @@ def testListHelmCharts(self):
 
         user_chart_password = "Aa123456"
         TestProjects.CHART_NAME = 'mariadb'
-        TestProjects.VERSION = '4.3.1'
-        base.run_command( ["curl", r"-o", "./tests/apitests/python/mariadb-4.3.1.tgz", "https://storage.googleapis.com/harbor-builds/bin/charts/mariadb-4.3.1.tgz"])
+        TestProjects.VERSION = '18.2.6'
+        base.run_command( ["curl", r"-o", "./tests/apitests/python/mariadb-18.2.6.tgz", "https://storage.googleapis.com/harbor-builds/bin/mariadb-18.2.6.tgz"])
 
         #1. Create a new user(UA);
         TestProjects.user_chart_id, user_chart_name = self.user.create_user(user_password = user_chart_password, **ADMIN_CLIENT)