Merge pull request #85 from sclorg/update_php_psql_python

Update php psql python
sclorg · Aug 2, 2024 · 44918c4 · 44918c4
2 parents 6a7bd4d + 06392ce
commit 44918c4
Show file tree

Hide file tree

Showing 15 changed files with 233 additions and 68 deletions.
diff --git a/Makefile b/Makefile
@@ -1,40 +1,40 @@
 .PHONY: test test-httpd test-php test-perl test-mariadb test-mysql test-nginx test-postgresql test-redis test-all test-nodejs test-ruby test-python
 
 test:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_varnish_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_varnish_*.py
 
 test-httpd:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_httpd_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_httpd_*.py
 
 test-mariadb:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_mariadb_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_mariadb_*.py
 
 test-mysql:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_mysql_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_mysql_*.py
 
 test-nginx:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_nginx_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_nginx_*.py
 
 test-postgresql:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_postgresql_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_postgresql_*.py
 
 test-redis:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_redis_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_redis_*.py
 
 test-php:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_php_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_php_*.py
 
 test-perl:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_perl_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_perl_*.py
 
 test-nodejs:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_nodejs_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_nodejs_*.py
 
 test-python:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_python_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_python_*.py
 
 test-ruby:
-	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_ruby_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_ruby_*.py
 
 test-all: test test-php test-httpd test-mariadb test-mysql test-nginx test-postgresql test-redis test-perl test-python test-ruby test-nodejs
 

diff --git a/charts/centos/php-imagestreams/src/templates/imagestreams.yaml b/charts/centos/php-imagestreams/src/templates/imagestreams.yaml
@@ -24,7 +24,61 @@ spec:
         sampleRepo: https://github.com/sclorg/cakephp-ex.git
       from:
         kind: ImageStreamTag
-        name: 8.0-ubi8
+        name: 8.2-ubi8
+      referencePolicy:
+        type: Local
+    - name: 8.2-ubi9
+      annotations:
+        openshift.io/display-name: PHP 8.2 (UBI 9)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Build and run PHP 8.2 applications on UBI 9. For more information 
+          about using this builder image, including OpenShift considerations, see 
+          https://github.com/sclorg/s2i-php-container/blob/master/8.2/README.md.
+        iconClass: icon-php
+        tags: builder,php
+        supports: php:8.2,php
+        version: "8.2"
+        sampleRepo: https://github.com/sclorg/cakephp-ex.git
+      from:
+        kind: DockerImage
+        name: registry.access.redhat.com/ubi9/php-82:latest
+      referencePolicy:
+        type: Local
+    - name: 8.2-ubi8
+      annotations:
+        openshift.io/display-name: PHP 8.2 (UBI 8)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Build and run PHP 8.2 applications on UBI 8. For more information 
+          about using this builder image, including OpenShift considerations, see 
+          https://github.com/sclorg/s2i-php-container/blob/master/8.2/README.md.
+        iconClass: icon-php
+        tags: builder,php
+        supports: php:8.2,php
+        version: "8.2"
+        sampleRepo: https://github.com/sclorg/cakephp-ex.git
+      from:
+        kind: DockerImage
+        name: registry.access.redhat.com/ubi8/php-82:latest
+      referencePolicy:
+        type: Local
+    - name: 8.1-ubi9
+      annotations:
+        openshift.io/display-name: PHP 8.1 (UBI 9)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Build and run PHP 8.1 applications on UBI 9. For more information 
+          about using this builder image, including OpenShift considerations, see 
+          https://github.com/sclorg/s2i-php-container/blob/master/8.1/README.md.
+        iconClass: icon-php
+        tags: builder,php
+        supports: php:8.1,php
+        version: "8.1"
+        sampleRepo: https://github.com/sclorg/cakephp-ex.git
+      from:
+        kind: DockerImage
+        name: registry.access.redhat.com/ubi9/php-81:latest
       referencePolicy:
         type: Local
     - name: 8.0-ubi9

diff --git a/charts/centos/postgresql-imagestreams/src/Chart.yaml b/charts/centos/postgresql-imagestreams/src/Chart.yaml
@@ -4,10 +4,10 @@ description: |-
 annotations:
   charts.openshift.io/name: CentOS PostgreSQL database service imagestreams
 apiVersion: v2
-appVersion: 0.0.1
+appVersion: 0.0.2
 kubeVersion: '>=1.20.0'
 name: postgresql-imagestreams
 tags: database,postgresql
 sources:
   - https://github.com/sclorg/helm-charts
-version: 0.0.1
+version: 0.0.2
diff --git a/charts/centos/postgresql-imagestreams/src/templates/imagestreams.yaml b/charts/centos/postgresql-imagestreams/src/templates/imagestreams.yaml
@@ -25,36 +25,52 @@ spec:
         name: 15-el9
       referencePolicy:
         type: Local
-    - name: 15-el9
+    - name: 16-el9
       annotations:
-        openshift.io/display-name: PostgreSQL 15 (CentOS Stream 9)
+        openshift.io/display-name: PostgreSQL 16 (CentOS Stream 9)
         openshift.io/provider-display-name: Red Hat, Inc.
         description: >-
-          Provides a PostgreSQL 15 database on CentOS Stream 9. For more information 
+          Provides a PostgreSQL 16 database on CentOS Stream 9. For more information 
           about using this database image, including OpenShift considerations, see 
           https://github.com/sclorg/postgresql-container/blob/master/README.md.
         iconClass: icon-postgresql
         tags: database,postgresql
-        version: "15"
+        version: "16"
       from:
         kind: DockerImage
-        name: quay.io/sclorg/postgresql-15-c9s:latest
+        name: quay.io/sclorg/postgresql-16-c9s:latest
       referencePolicy:
         type: Local
-    - name: 13-el9
+    - name: 16-el8
       annotations:
-        openshift.io/display-name: PostgreSQL 13 (CentOS Stream 9)
+        openshift.io/display-name: PostgreSQL 16 (CentOS Stream 8)
         openshift.io/provider-display-name: Red Hat, Inc.
         description: >-
-          Provides a PostgreSQL 13 database on CentOS Stream 9. For more information 
+          Provides a PostgreSQL 16 database on CentOS Stream 8. For more information 
           about using this database image, including OpenShift considerations, see 
           https://github.com/sclorg/postgresql-container/blob/master/README.md.
         iconClass: icon-postgresql
         tags: database,postgresql
-        version: "13"
+        version: "16"
       from:
         kind: DockerImage
-        name: quay.io/sclorg/postgresql-13-c9s:latest
+        name: quay.io/sclorg/postgresql-16-c8s:latest
+      referencePolicy:
+        type: Local
+    - name: 15-el9
+      annotations:
+        openshift.io/display-name: PostgreSQL 15 (CentOS Stream 9)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Provides a PostgreSQL 15 database on CentOS Stream 9. For more information 
+          about using this database image, including OpenShift considerations, see 
+          https://github.com/sclorg/postgresql-container/blob/master/README.md.
+        iconClass: icon-postgresql
+        tags: database,postgresql
+        version: "15"
+      from:
+        kind: DockerImage
+        name: quay.io/sclorg/postgresql-15-c9s:latest
       referencePolicy:
         type: Local
     - name: 15-el8
@@ -73,6 +89,22 @@ spec:
         name: quay.io/sclorg/postgresql-15-c8s:latest
       referencePolicy:
         type: Local
+    - name: 13-el9
+      annotations:
+        openshift.io/display-name: PostgreSQL 13 (CentOS Stream 9)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Provides a PostgreSQL 13 database on CentOS Stream 9. For more information 
+          about using this database image, including OpenShift considerations, see 
+          https://github.com/sclorg/postgresql-container/blob/master/README.md.
+        iconClass: icon-postgresql
+        tags: database,postgresql
+        version: "13"
+      from:
+        kind: DockerImage
+        name: quay.io/sclorg/postgresql-13-c9s:latest
+      referencePolicy:
+        type: Local
     - name: 13-el8
       annotations:
         openshift.io/display-name: PostgreSQL 13 (CentOS Stream 8)

diff --git a/charts/centos/python-imagestreams/src/templates/imagestreams.yaml b/charts/centos/python-imagestreams/src/templates/imagestreams.yaml
@@ -24,33 +24,87 @@ spec:
         sampleRepo: https://github.com/sclorg/django-ex.git
       from:
         kind: ImageStreamTag
-        name: 3.9-ubi8
+        name: 3.12-ubi8
       referencePolicy:
         type: Local
-    - name: 3.9-ubi9
+    - name: 3.12-ubi9
       annotations:
-        openshift.io/display-name: Python 3.9 (UBI 9)
+        openshift.io/display-name: Python 3.12 (UBI 9)
         openshift.io/provider-display-name: Red Hat, Inc.
         description: >-
-          Build and run Python 3.9 applications on UBI 9. For more information 
+          Build and run Python 3.12 applications on UBI 9. For more information 
           about using this builder image, including OpenShift considerations, see 
-          https://github.com/sclorg/s2i-python-container/blob/master/3.9/README.md.
+          https://github.com/sclorg/s2i-python-container/blob/master/3.12/README.md.
         iconClass: icon-python
         tags: builder,python
-        supports: python:3.9,python
-        version: "3.9"
+        supports: python:3.12,python
+        version: "3.12"
         sampleRepo: https://github.com/sclorg/django-ex.git
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/ubi9/python-39:latest
+        name: registry.access.redhat.com/ubi9/python-312:latest
       referencePolicy:
         type: Local
-    - name: 3.9-ubi8
+    - name: 3.12-ubi8
       annotations:
-        openshift.io/display-name: Python 3.9 (UBI 8)
+        openshift.io/display-name: Python 3.12 (UBI 8)
         openshift.io/provider-display-name: Red Hat, Inc.
         description: >-
-          Build and run Python 3.9 applications on UBI 8. For more information 
+          Build and run Python 3.12 applications on UBI 8. For more information 
+          about using this builder image, including OpenShift considerations, see 
+          https://github.com/sclorg/s2i-python-container/blob/master/3.12/README.md.
+        iconClass: icon-python
+        tags: builder,python
+        supports: python:3.12,python
+        version: "3.12"
+        sampleRepo: https://github.com/sclorg/django-ex.git
+      from:
+        kind: DockerImage
+        name: registry.access.redhat.com/ubi8/python-312:latest
+      referencePolicy:
+        type: Local
+    - name: 3.11-ubi9
+      annotations:
+        openshift.io/display-name: Python 3.11 (UBI 9)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Build and run Python 3.11 applications on UBI 9. For more information 
+          about using this builder image, including OpenShift considerations, see 
+          https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md.
+        iconClass: icon-python
+        tags: builder,python
+        supports: python:3.11,python
+        version: "3.11"
+        sampleRepo: https://github.com/sclorg/django-ex.git
+      from:
+        kind: DockerImage
+        name: registry.access.redhat.com/ubi9/python-311:latest
+      referencePolicy:
+        type: Local
+    - name: 3.11-ubi8
+      annotations:
+        openshift.io/display-name: Python 3.11 (UBI 8)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Build and run Python 3.11 applications on UBI 8. For more information 
+          about using this builder image, including OpenShift considerations, see 
+          https://github.com/sclorg/s2i-python-container/blob/master/3.11/README.md.
+        iconClass: icon-python
+        tags: builder,python
+        supports: python:3.11,python
+        version: "3.11"
+        sampleRepo: https://github.com/sclorg/django-ex.git
+      from:
+        kind: DockerImage
+        name: registry.access.redhat.com/ubi8/python-311:latest
+      referencePolicy:
+        type: Local
+    - name: 3.9-ubi9
+      annotations:
+        openshift.io/display-name: Python 3.9 (UBI 9)
+        openshift.io/provider-display-name: Red Hat, Inc.
+        description: >-
+          Build and run Python 3.9 applications on UBI 9. For more information 
           about using this builder image, including OpenShift considerations, see 
           https://github.com/sclorg/s2i-python-container/blob/master/3.9/README.md.
         iconClass: icon-python
@@ -60,25 +114,25 @@ spec:
         sampleRepo: https://github.com/sclorg/django-ex.git
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/ubi8/python-39:latest
+        name: registry.access.redhat.com/ubi9/python-39:latest
       referencePolicy:
         type: Local
-    - name: 3.8-ubi8
+    - name: 3.9-ubi8
       annotations:
-        openshift.io/display-name: Python 3.8 (UBI 8)
+        openshift.io/display-name: Python 3.9 (UBI 8)
         openshift.io/provider-display-name: Red Hat, Inc.
         description: >-
-          Build and run Python 3.8 applications on UBI 8. For more information 
+          Build and run Python 3.9 applications on UBI 8. For more information 
           about using this builder image, including OpenShift considerations, see 
-          https://github.com/sclorg/s2i-python-container/blob/master/3.8/README.md.
+          https://github.com/sclorg/s2i-python-container/blob/master/3.9/README.md.
         iconClass: icon-python
         tags: builder,python
-        supports: python:3.8,python
-        version: "3.8"
+        supports: python:3.9,python
+        version: "3.9"
         sampleRepo: https://github.com/sclorg/django-ex.git
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/ubi8/python-38:latest
+        name: registry.access.redhat.com/ubi8/python-39:latest
       referencePolicy:
         type: Local
     - name: 3.6-ubi8

diff --git a/charts/redhat/php-imagestreams/src/Chart.yaml b/charts/redhat/php-imagestreams/src/Chart.yaml
@@ -5,10 +5,10 @@ description: |-
 annotations:
   charts.openshift.io/name: Red Hat PHP applications on UBI (experimental)
 apiVersion: v2
-appVersion: 0.0.2
+appVersion: 0.0.3
 kubeVersion: '>=1.20.0'
 name: php-imagestreams
 tags: builder,php
 sources:
   - https://github.com/sclorg/helm-charts
-version: 0.0.2
+version: 0.0.3