Merge branch 'development' into 'master'

Development See merge request !10

Merge branch 'development' into 'master'
Development See merge request !10
36a47e7c · Hunter Stevens · 5415abe3 · e3dc1047 · 36a47e7c · 36a47e7c
Commit 36a47e7c authored Nov 24, 2020 by Hunter Stevens
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 14 deletions

Dockerfile Dockerfile +4 -4

Jenkinsfile Jenkinsfile +1 -1

download.yaml download.yaml +9 -9

No files found.
--- a/Dockerfile
+++ b/Dockerfile
 ARG BASE_REGISTRY=registry1.dsop.io
-ARG BASE_IMAGE=redhat/ubi/ubi8
-ARG BASE_TAG=8.2
+ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
+ARG BASE_TAG=8.3

 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}

 LABEL name="MariaDB" \
      maintainer="bhearn@anchore.com" \
      vendor="Open Source" \
-      version="10.5.4" \
+      version="10.5.8" \
      release="1" \
      summary="Image of MariaDB" \
      description="MariaDB is a community-developed fork of the MySQL relational database management system."
@@ -43,4 +43,4 @@ ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"]

 EXPOSE 3306

-CMD ["mysqld"]
\ No newline at end of file
+CMD ["mysqld"]
--- a/Jenkinsfile
+++ b/Jenkinsfile
 @Library('DCCSCR@master') _
-dccscrPipeline(version: "10.5.4")
\ No newline at end of file
+dccscrPipeline(version: "10.5.8")
--- a/download.yaml
+++ b/download.yaml
 ---
 resources:
-  - url: "https://yum.mariadb.org/10.5.4/rhel8-amd64/rpms/MariaDB-server-10.5.4-1.el8.x86_64.rpm"
+  - url: "https://yum.mariadb.org/10.5.8/rhel8-amd64/rpms/MariaDB-server-10.5.8-1.el8.x86_64.rpm"
    filename: "mariadb-server.rpm"
    validation:
      type: "sha256"
-      value: "3c6933223ebb912e3ab94e6eace5614c6d419d93cf671714df67a193391584f4"
-  - url: "https://yum.mariadb.org/10.5.4/rhel8-amd64/rpms/MariaDB-client-10.5.4-1.el8.x86_64.rpm"
+      value: "14fcda323b749aec9c85d66df3bca92f827124644e312e97c29fc850b3c5515e"
+  - url: "https://yum.mariadb.org/10.5.8/rhel8-amd64/rpms/MariaDB-client-10.5.8-1.el8.x86_64.rpm"
    filename: "mariadb-client.rpm"
    validation:
      type: "sha256"
-      value: "c5d8ea14a446cf024988e18209087f084bc1fda1d7bef5d5b4a659862eb70356"
-  - url: "https://yum.mariadb.org/10.5.4/rhel8-amd64/rpms/MariaDB-common-10.5.4-1.el8.x86_64.rpm"
+      value: "daccd783ab8adedf3d5515de3f413643028dd946b6def017170f501ac2a0c9f2"
+  - url: "https://yum.mariadb.org/10.5.8/rhel8-amd64/rpms/MariaDB-common-10.5.8-1.el8.x86_64.rpm"
    filename: "mariadb-common.rpm"
    validation:
      type: "sha256"
-      value: "96ce6eefec5a780efe688f288d8739e642d21627e750bf6c58bf6ae48f30386f"
-  - url: "https://yum.mariadb.org/10.5.4/rhel8-amd64/rpms/MariaDB-shared-10.5.4-1.el8.x86_64.rpm"
+      value: "368ded82a22dcc45ac41841110542a4a7d3969314e04d2847018b17a9d4223df"
+  - url: "https://yum.mariadb.org/10.5.8/rhel8-amd64/rpms/MariaDB-shared-10.5.8-1.el8.x86_64.rpm"
    filename: "mariadb-shared.rpm"
    validation:
      type: "sha256"
-      value: "d90fbb4115b5e1115c5ae8428bb62fc03909b0159aaccd1c9c345746aa407297"
-  - url: "https://yum.mariadb.org/10.5.4/rhel8-amd64/rpms/galera-4-26.4.5-1.el8.x86_64.rpm"
+      value: "abf5cc16105ec787c143afe02f66d93b095db8b894f1df29970d743ff3b33345"
+  - url: "https://yum.mariadb.org/10.5.8/rhel8-amd64/rpms/galera-4-26.4.5-1.el8.x86_64.rpm"
    filename: "galera.rpm"
    validation:
      type: "sha256"