diff --git a/make/photon/chartserver/Dockerfile.base b/make/photon/chartserver/Dockerfile.base index 54a15d5302d..d66f19627ac 100644 --- 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 index 71c3165afde..3105b70f7d2 100644 --- 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 index 85104102cd5..0dddd188d5c 100644 --- 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 index 99360863996..28a55fa1ce2 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 sudo tzdata -y >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/db/Dockerfile.base b/make/photon/db/Dockerfile.base index bbb11e20a79..6a6711b60b2 100644 --- 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 index 54e48d4c8db..5721772ea98 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 sudo tzdata -y >> /dev/null \ && tdnf clean all \ diff --git a/make/photon/log/Dockerfile.base b/make/photon/log/Dockerfile.base index 9ccedb16022..47e7f67fa31 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 0c6ddeb1ad1..d6a18e543fc 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/notary-server/Dockerfile.base b/make/photon/notary-server/Dockerfile.base index f64810f7a11..a2f5a02a894 100644 --- 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 index f64810f7a11..a2f5a02a894 100644 --- 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 index cf9d5af892a..7d078696a6d 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 46e24a2e5dc..284f6ef3294 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 \ && tdnf install -y python3-pip python3-PyYAML python3-jinja2 diff --git a/make/photon/redis/Dockerfile.base b/make/photon/redis/Dockerfile.base index 8b9e2210b91..172f2db9917 100644 --- 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 index d946d648c12..853618578f2 100644 --- 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 index 74110ce7850..af79187f1be 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 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 index 97535e9ab73..da10fc99ff5 100644 --- 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)