From d23227e609033f047b73872b23c65dcb9ffad6c5 Mon Sep 17 00:00:00 2001 From: pathak_pradip Date: Mon, 23 Nov 2020 19:42:53 -0800 Subject: [PATCH 1/5] Update Versions, Dependencies and base image --- Dockerfile | 15 ++++++++------- Jenkinsfile | 2 +- download.yaml | 30 +++++++++++++++--------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0bd97a4..4802893 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ ARG BASE_REGISTRY=registry1.dsop.io -ARG BASE_IMAGE=redhat/ubi/ubi8 -ARG BASE_TAG=8.2 +ARG BASE_IMAGE=ironbank/redhat/ubi/ubi7 +ARG BASE_TAG=7.9 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG} LABEL name="MariaDB" \ maintainer="michael.simmons@anchore.com" \ vendor="Open Source" \ - version="10.2.32" \ + version="10.2.36" \ release="1" \ summary="Image of MariaDB" \ description="MariaDB is a community-developed fork of the MySQL relational database management system." @@ -19,9 +19,10 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql && \ rpm --import RPM-GPG-KEY-MariaDB && \ rpm --import RPM-GPG-KEY-CentOS-Official && \ rpm --import RPM-GPG-KEY-CentOS-7 && \ - dnf -y update && \ - dnf -y install mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm openssl.rpm libnsl.rpm --setopt=tsflags=nodocs && \ - dnf clean all && \ + yum -y update && \ + yum -y install mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm openssl.rpm libnsl.rpm --setopt=tsflags=nodocs && \ + yum -y update && \ + yum clean all && \ rm -rf /var/cache/dnf && \ rm mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm openssl.rpm libnsl.rpm RPM-GPG-KEY-MariaDB RPM-GPG-KEY-CentOS-Official RPM-GPG-KEY-CentOS-7 && \ chmod +x /usr/local/bin/docker-entrypoint.sh && \ @@ -38,4 +39,4 @@ ENTRYPOINT ["/usr/local/bin/docker-entrypoint.sh"] EXPOSE 3306 -CMD ["mysqld"] \ No newline at end of file +CMD ["mysqld"] diff --git a/Jenkinsfile b/Jenkinsfile index c007b0b..1ea7127 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,4 +1,4 @@ @Library('DCCSCR@master') _ dccscrPipeline( - version: "10.2.32" + version: "10.2.36" ) diff --git a/download.yaml b/download.yaml index 993f69d..93e8cb4 100644 --- a/download.yaml +++ b/download.yaml @@ -1,30 +1,30 @@ resources: - - url: "https://yum.mariadb.org/10.2.32/rhel7-amd64/rpms/MariaDB-server-10.2.32-1.el7.centos.x86_64.rpm" + - url: "https://yum.mariadb.org/10.2.36/rhel7-amd64/rpms/MariaDB-server-10.2.36-1.el7.centos.x86_64.rpm" filename: "mariadb-server.rpm" validation: type: "sha256" - value: "17f40f06be93adf411f4b3efbe2c317db3499c9f0daa477e58b2bf67fa4e774e" - - url: "https://yum.mariadb.org/10.2.32/rhel7-amd64/rpms/MariaDB-client-10.2.32-1.el7.centos.x86_64.rpm" + value: "66efcfe077199e0338650568331ae87780a29d397b4bda81b664d5d2b9511974" + - url: "https://yum.mariadb.org/10.2.36/rhel7-amd64/rpms/MariaDB-client-10.2.36-1.el7.centos.x86_64.rpm" filename: "mariadb-client.rpm" validation: type: "sha256" - value: "2dfe24400bacab6db13e90b27447a1473cb68552fe6f716ff834fad4f3371d4f" - - url: "https://yum.mariadb.org/10.2.32/rhel7-amd64/rpms/MariaDB-common-10.2.32-1.el7.centos.x86_64.rpm" + value: "70948a763232bf9bd69f719ff7528f5b01dfedfc49baa33708cd949c42b4bef0" + - url: "https://yum.mariadb.org/10.2.36/rhel7-amd64/rpms/MariaDB-common-10.2.36-1.el7.centos.x86_64.rpm" filename: "mariadb-common.rpm" validation: type: "sha256" - value: "c2a182f433754e7def351d024b862770b07b13696f95372338366fdb42dfd945" - - url: "https://yum.mariadb.org/10.2.32/rhel7-amd64/rpms/MariaDB-shared-10.2.32-1.el7.centos.x86_64.rpm" + value: "db4cc11948336fed9e23cdf48d68a5bf7a8cb973d35e1d41fe5db4fcb089ff2a" + - url: "https://yum.mariadb.org/10.2.36/rhel7-amd64/rpms/MariaDB-shared-10.2.36-1.el7.centos.x86_64.rpm" filename: "mariadb-shared.rpm" validation: type: "sha256" - value: "1fb6a5008f95bc2b5c6e54bc149f29aef99884388fb6eb961bbcff6e8e4442dd" - - url: "https://yum.mariadb.org/10.2.32/rhel7-amd64/rpms/MariaDB-compat-10.2.32-1.el7.centos.x86_64.rpm" + value: "e63005ee9d6b3602410250a714e4585b7f87af0e3d31af4cd5fa94dd71e941a6" + - url: "https://yum.mariadb.org/10.2.36/rhel7-amd64/rpms/MariaDB-compat-10.2.36-1.el7.centos.x86_64.rpm" filename: "mariadb-compat.rpm" validation: type: "sha256" - value: "224b4d4ff7c1a7e2b901cc3fde9fa81e1fc0726fcd92b2732133d768c602ef57" - - url: "https://yum.mariadb.org/10.2.32/rhel7-amd64/rpms/galera-25.3.29-1.rhel7.el7.centos.x86_64.rpm" + value: "38cb7f81c341504497bc046c88da2460693f95b3397ed780ea9a230d4cfdf245" + - url: "https://yum.mariadb.org/10.2.36/rhel7-amd64/rpms/galera-25.3.29-1.rhel7.el7.centos.x86_64.rpm" filename: "galera.rpm" validation: type: "sha256" @@ -34,13 +34,13 @@ resources: validation: type: "sha256" value: "1aa6d9b776bb246523faa8396bb5d06b50fc7010c112ace3689872b4c22fae23" - - url: "http://mirror.centos.org/centos/8/BaseOS/x86_64/os/Packages/libnsl-2.28-101.el8.x86_64.rpm" + - url: "http://mirror.centos.org/centos/7/os/x86_64/Packages/glibc-2.17-317.el7.x86_64.rpm" filename: "libnsl.rpm" validation: type: "sha256" - value: "f498899da64b52245726e0e3c9f28c6456707a94e76e2eba137073c1ec218b54" - - url: "http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/compat-openssl10-1.0.2o-3.el8.x86_64.rpm" + value: "49eb081de1ddd13f5440abdbb3b42cdd01d11b74d624793ae1b80a1cf432551b" + - url: "http://mirror.centos.org/altarch/7/os/aarch64/Packages/openssl-1.0.2k-19.el7.aarch64.rpm" filename: "openssl.rpm" validation: type: "sha256" - value: "2baa59d2c0c03ce262a5188596c8f0e4b90c307f81236746a5e831d4e17a18ca" \ No newline at end of file + value: "1cd7142ad42b088d7555c8fadba300f88c2a3c3d2900e4147e174668fd0cb7d3" \ No newline at end of file -- GitLab From e3e8507e0e356a084d518827bcce5e98f3ffc240 Mon Sep 17 00:00:00 2001 From: Pradip Pathak Date: Tue, 24 Nov 2020 16:54:25 +0000 Subject: [PATCH 2/5] Update download.yaml --- download.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/download.yaml b/download.yaml index 93e8cb4..ca5bc8e 100644 --- a/download.yaml +++ b/download.yaml @@ -38,9 +38,4 @@ resources: filename: "libnsl.rpm" validation: type: "sha256" - value: "49eb081de1ddd13f5440abdbb3b42cdd01d11b74d624793ae1b80a1cf432551b" - - url: "http://mirror.centos.org/altarch/7/os/aarch64/Packages/openssl-1.0.2k-19.el7.aarch64.rpm" - filename: "openssl.rpm" - validation: - type: "sha256" - value: "1cd7142ad42b088d7555c8fadba300f88c2a3c3d2900e4147e174668fd0cb7d3" \ No newline at end of file + value: "49eb081de1ddd13f5440abdbb3b42cdd01d11b74d624793ae1b80a1cf432551b" \ No newline at end of file -- GitLab From f2eb6fe0a257b10af2f0b92867dc484693a75a02 Mon Sep 17 00:00:00 2001 From: Pradip Pathak Date: Tue, 24 Nov 2020 17:00:46 +0000 Subject: [PATCH 3/5] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4802893..2ceeb9c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ LABEL name="MariaDB" \ summary="Image of MariaDB" \ description="MariaDB is a community-developed fork of the MySQL relational database management system." -COPY mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm openssl.rpm libnsl.rpm signatures/RPM-GPG-KEY-MariaDB signatures/RPM-GPG-KEY-CentOS-Official signatures/RPM-GPG-KEY-CentOS-7 / +COPY mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm libnsl.rpm signatures/RPM-GPG-KEY-MariaDB signatures/RPM-GPG-KEY-CentOS-Official signatures/RPM-GPG-KEY-CentOS-7 / COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN groupadd -r mysql && useradd -r -g mysql mysql && \ @@ -20,11 +20,11 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql && \ rpm --import RPM-GPG-KEY-CentOS-Official && \ rpm --import RPM-GPG-KEY-CentOS-7 && \ yum -y update && \ - yum -y install mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm openssl.rpm libnsl.rpm --setopt=tsflags=nodocs && \ + yum -y install mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm libnsl.rpm --setopt=tsflags=nodocs && \ yum -y update && \ yum clean all && \ rm -rf /var/cache/dnf && \ - rm mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm openssl.rpm libnsl.rpm RPM-GPG-KEY-MariaDB RPM-GPG-KEY-CentOS-Official RPM-GPG-KEY-CentOS-7 && \ + rm mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm libnsl.rpm RPM-GPG-KEY-MariaDB RPM-GPG-KEY-CentOS-Official RPM-GPG-KEY-CentOS-7 && \ chmod +x /usr/local/bin/docker-entrypoint.sh && \ ln -s usr/local/bin/docker-entrypoint.sh -- GitLab From 323c78deb0898fc8454526324ceb7b73e9309f60 Mon Sep 17 00:00:00 2001 From: Pradip Pathak Date: Tue, 24 Nov 2020 21:54:29 +0000 Subject: [PATCH 4/5] Update download.yaml --- download.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/download.yaml b/download.yaml index ca5bc8e..375ebb1 100644 --- a/download.yaml +++ b/download.yaml @@ -33,9 +33,4 @@ resources: filename: "boost.rpm" validation: type: "sha256" - value: "1aa6d9b776bb246523faa8396bb5d06b50fc7010c112ace3689872b4c22fae23" - - url: "http://mirror.centos.org/centos/7/os/x86_64/Packages/glibc-2.17-317.el7.x86_64.rpm" - filename: "libnsl.rpm" - validation: - type: "sha256" - value: "49eb081de1ddd13f5440abdbb3b42cdd01d11b74d624793ae1b80a1cf432551b" \ No newline at end of file + value: "1aa6d9b776bb246523faa8396bb5d06b50fc7010c112ace3689872b4c22fae23" \ No newline at end of file -- GitLab From 76329c4e010cf62b9c8686c7af7b124e2dd237c2 Mon Sep 17 00:00:00 2001 From: Pradip Pathak Date: Tue, 24 Nov 2020 22:01:27 +0000 Subject: [PATCH 5/5] Update Dockerfile --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2ceeb9c..e7ee40f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ LABEL name="MariaDB" \ summary="Image of MariaDB" \ description="MariaDB is a community-developed fork of the MySQL relational database management system." -COPY mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm libnsl.rpm signatures/RPM-GPG-KEY-MariaDB signatures/RPM-GPG-KEY-CentOS-Official signatures/RPM-GPG-KEY-CentOS-7 / +COPY mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm signatures/RPM-GPG-KEY-MariaDB signatures/RPM-GPG-KEY-CentOS-Official signatures/RPM-GPG-KEY-CentOS-7 / COPY scripts/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh RUN groupadd -r mysql && useradd -r -g mysql mysql && \ @@ -20,11 +20,11 @@ RUN groupadd -r mysql && useradd -r -g mysql mysql && \ rpm --import RPM-GPG-KEY-CentOS-Official && \ rpm --import RPM-GPG-KEY-CentOS-7 && \ yum -y update && \ - yum -y install mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm libnsl.rpm --setopt=tsflags=nodocs && \ + yum -y install mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm --setopt=tsflags=nodocs && \ yum -y update && \ yum clean all && \ rm -rf /var/cache/dnf && \ - rm mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm libnsl.rpm RPM-GPG-KEY-MariaDB RPM-GPG-KEY-CentOS-Official RPM-GPG-KEY-CentOS-7 && \ + rm mariadb-server.rpm mariadb-client.rpm mariadb-common.rpm mariadb-shared.rpm mariadb-compat.rpm galera.rpm boost.rpm RPM-GPG-KEY-MariaDB RPM-GPG-KEY-CentOS-Official RPM-GPG-KEY-CentOS-7 && \ chmod +x /usr/local/bin/docker-entrypoint.sh && \ ln -s usr/local/bin/docker-entrypoint.sh -- GitLab