Fix docker_context to string.

Add the latest mariadb imagestreams. RHEL_8.10 is GA Signed-off-by: Petr "Stone" Hracek <[email protected]>
sclorg · Jun 7, 2024 · 6f0fe35 · 6f0fe35
1 parent 574990e
commit 6f0fe35
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 6 deletions.
diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-and-push.yml
@@ -15,31 +15,31 @@ jobs:
       matrix:
         include:
           - dockerfile: "10.11/Dockerfile.c9s"
-            docker_context: 10.11
+            docker_context: "10.11"
             registry_namespace: "sclorg"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             tag: "c9s"
             image_name: "mariadb-1011-c9s"
 
           - dockerfile: "10.5/Dockerfile.c9s"
-            docker_context: 10.5
+            docker_context: "10.5"
             registry_namespace: "sclorg"
             quayio_username: "QUAY_IMAGE_SCLORG_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_SCLORG_BUILDER_TOKEN"
             tag: "c9s"
             image_name: "mariadb-105-c9s"
 
           - dockerfile: "10.5/Dockerfile.fedora"
-            docker_context: 10.5
+            docker_context: "10.5"
             registry_namespace: "fedora"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"
             tag: "fedora"
             image_name: "mariadb-105"
 
           - dockerfile: "10.11/Dockerfile.fedora"
-            docker_context: 10.11
+            docker_context: "10.11"
             registry_namespace: "fedora"
             quayio_username: "QUAY_IMAGE_FEDORA_BUILDER_USERNAME"
             quayio_token: "QUAY_IMAGE_FEDORA_BUILDER_TOKEN"

diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml
@@ -21,7 +21,7 @@
         app_versions: ["10.3", "10.5"]
 
       - name: RHEL 8
-        app_versions: ["10.3", "10.5"]
+        app_versions: ["10.3", "10.5", "10.11"]
 
       - name: RHEL 9
         app_versions: ["10.5", "10.11"]
@@ -30,7 +30,7 @@
     latest: "10.11-el9"
     distros:
       - name: RHEL 8
-        app_versions: ["10.3", "10.5"]
+        app_versions: ["10.3", "10.5", "10.11"]
 
       - name: RHEL 9
         app_versions: ["10.5", "10.11"]
diff --git a/imagestreams/mariadb-rhel-aarch64.json b/imagestreams/mariadb-rhel-aarch64.json
@@ -45,6 +45,24 @@
           "type": "Local"
         }
       },
+      {
+        "name": "10.11-el8",
+        "annotations": {
+          "openshift.io/display-name": "MariaDB 10.11 (RHEL 8)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a MariaDB 10.11 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.11/README.md.",
+          "iconClass": "icon-mariadb",
+          "tags": "database,mariadb",
+          "version": "10.11"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/rhel8/mariadb-1011:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "10.5-el9",
         "annotations": {

diff --git a/imagestreams/mariadb-rhel.json b/imagestreams/mariadb-rhel.json
@@ -81,6 +81,24 @@
           "type": "Local"
         }
       },
+      {
+        "name": "10.11-el8",
+        "annotations": {
+          "openshift.io/display-name": "MariaDB 10.11 (RHEL 8)",
+          "openshift.io/provider-display-name": "Red Hat, Inc.",
+          "description": "Provides a MariaDB 10.11 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.11/README.md.",
+          "iconClass": "icon-mariadb",
+          "tags": "database,mariadb",
+          "version": "10.11"
+        },
+        "from": {
+          "kind": "DockerImage",
+          "name": "registry.redhat.io/rhel8/mariadb-1011:latest"
+        },
+        "referencePolicy": {
+          "type": "Local"
+        }
+      },
       {
         "name": "10.5-el9",
         "annotations": {