Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[percona] update psmdb #8878

Merged
merged 1 commit into from
Oct 12, 2020
Merged

[percona] update psmdb #8878

merged 1 commit into from
Oct 12, 2020

Conversation

EvgeniyPatlan
Copy link
Contributor

No description provided.

@EvgeniyPatlan EvgeniyPatlan mentioned this pull request Oct 10, 2020
Closed
@tianon
Copy link
Member

tianon commented Oct 12, 2020

(force push due to actions/runner#751 so we can hopefully get some test builds)

@github-actions
Copy link

Diff for 48b16fb: 
diff --git a/_bashbrew-cat b/_bashbrew-cat
index c8de198..f6f3349 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -16,17 +16,17 @@ GitCommit: 65855912b9946093cee42f987336440972405391
 Directory: percona-server.80
 
 Tags: psmdb-3.6.19, psmdb-3.6
-GitCommit: ffcb69d7026891a1ddce412a39d5699422d054ec
+GitCommit: a949d60e22172d6329d6509253e6db254898217e
 Directory: percona-server-mongodb-3.6
 
 Tags: psmdb-4.0.20, psmdb-4.0
-GitCommit: adcc0afde81a4f22c7860ca4700dab6853c463c6
+GitCommit: edef48f13966c4581e7ee77138b24133ba70174b
 Directory: percona-server-mongodb-4.0
 
 Tags: psmdb-4.2.9, psmdb-4.2
-GitCommit: 3afa8f854ae31a688c4efd47bc0e622125cc155d
+GitCommit: 6962f2215220e998b357abcf20c31334adfeb506
 Directory: percona-server-mongodb-4.2
 
 Tags: psmdb-4.4.1, psmdb-4.4
-GitCommit: bed0f0e055fd65243fcce3dd7de499de410d04e4
+GitCommit: 602119736d5c4426ab60fbd8c05cc081a73e975d
 Directory: percona-server-mongodb-4.4
diff --git a/percona_psmdb-3.6/Dockerfile b/percona_psmdb-3.6/Dockerfile
index 0abb0e3..1872d5f 100644
--- a/percona_psmdb-3.6/Dockerfile
+++ b/percona_psmdb-3.6/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7
+FROM centos:8
 
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.name="Percona Server for MongoDB"
@@ -18,48 +18,34 @@ plus additional enterprise-grade functionality."
 LABEL org.opencontainers.image.license="SSPLv1"
 LABEL org.opencontainers.image.authors="info@percona.com"
 
-ENV PSMDB_VERSION 3.6.19-7.0
+ENV PSMDB_VERSION 3.6.19-8.0
+ENV OS_VER el8
+ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
+ENV K8S_TOOLS_VERSION "0.5.0"
 LABEL org.label-schema.schema-version=${PSMDB_VERSION}
 LABEL org.opencontainers.image.version=${PSMDB_VERSION}
 
 # check repository package signature in secure way
 RUN set -ex; \
     export GNUPGHOME="$(mktemp -d)"; \
-    gpg --batch --keyserver pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A; \
-    gpg --batch --keyserver pool.sks-keyservers.net --recv-keys 6341AB2753D78A78A7C27BB124C6A8A7F4A80EB5; \
-    gpg --batch --keyserver pool.sks-keyservers.net --recv-keys 91E97D7C4A5E96F17F3E888F6A2FAEA2352C64E5; \
-    \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 99DB70FAE1D7CE227FB6488205B555B38483C65D; \
     gpg --batch --export --armor 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A > ${GNUPGHOME}/RPM-GPG-KEY-Percona; \
-    gpg --batch --export --armor 6341AB2753D78A78A7C27BB124C6A8A7F4A80EB5 > ${GNUPGHOME}/RPM-GPG-KEY-CentOS-7; \
-    gpg --batch --export --armor 91E97D7C4A5E96F17F3E888F6A2FAEA2352C64E5 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-7; \
-    rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona ${GNUPGHOME}/RPM-GPG-KEY-CentOS-7 ${GNUPGHOME}/RPM-GPG-KEY-EPEL-7; \
-    \
+    gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \
+    rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \
     curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \
     rpmkeys --checksig /tmp/percona-release.rpm; \
-    rpm -i /tmp/percona-release.rpm; \
+    dnf install -y /tmp/percona-release.rpm; \
     rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
     rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY
 
-# install exact version for repeatability
-ENV OS_VER el7
-ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
-ENV K8S_TOOLS_VERSION "0.5.0"
-
-RUN set -ex; \
-    curl -Lf -o /tmp/jq.rpm https://download.fedoraproject.org/pub/epel/7/x86_64/Packages/j/jq-1.6-2.el7.x86_64.rpm; \
-    curl -Lf -o /tmp/oniguruma.rpm https://download.fedoraproject.org/pub/epel/7/x86_64/Packages/o/oniguruma-6.8.2-1.el7.x86_64.rpm; \
-    rpmkeys --checksig /tmp/jq.rpm /tmp/oniguruma.rpm; \
-    \
-    rpm -i /tmp/jq.rpm /tmp/oniguruma.rpm; \
-    rm -rf /tmp/jq.rpm /tmp/oniguruma.rpm
-
 RUN set -ex; \
-    sed -i '/nodocs/d' /etc/yum.conf || :; \
-    yum install -y \
-        yum-utils \
+    dnf install -y \
+        dnf-utils \
         shadow-utils \
         curl \
         procps-ng \
+        jq \
+        oniguruma \
         Percona-Server-MongoDB-36-shell-${FULL_PERCONA_VERSION} \
         Percona-Server-MongoDB-36-mongos-${FULL_PERCONA_VERSION}; \
         repoquery -a --location \
@@ -71,8 +57,9 @@ RUN set -ex; \
         rpm -iv /tmp/policycoreutils.rpm /tmp/Percona-Server-MongoDB-36-server-${FULL_PERCONA_VERSION}.rpm --nodeps; \
         \
         rm -rf /tmp/policycoreutils.rpm /tmp/Percona-Server-MongoDB-36-server-${FULL_PERCONA_VERSION}.rpm; \
-        yum clean all; \
-        rm -rf /var/cache/yum /data/db && mkdir -p /data/db; \
+        dnf remove -y dnf-utils; \
+        dnf clean all; \
+        rm -rf /var/cache/dnf /data/db && mkdir -p /data/db; \
         chown -R 1001:0 /data/db
 
 # the numeric UID is needed for OpenShift
@@ -80,7 +67,7 @@ RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
             -c "Default Application User" mongodb
 
 COPY LICENSE /licenses/LICENSE.Dockerfile
-RUN cp /usr/share/doc/Percona-Server-MongoDB-36-server-$(echo ${FULL_PERCONA_VERSION} | cut -d - -f 1)/LICENSE-Community.txt /licenses/LICENSE.Percona-Server-for-MongoDB
+RUN cp /usr/share/doc/Percona-Server-MongoDB-36-server/LICENSE-Community.txt /licenses/LICENSE.Percona-Server-for-MongoDB
 
 RUN set -ex; \
     curl -fSL https://github.com/percona/mongodb-orchestration-tools/releases/download/${K8S_TOOLS_VERSION}/k8s-mongodb-initiator -o /usr/local/bin/k8s-mongodb-initiator; \
diff --git a/percona_psmdb-4.0/Dockerfile b/percona_psmdb-4.0/Dockerfile
index 724640a..68ac289 100644
--- a/percona_psmdb-4.0/Dockerfile
+++ b/percona_psmdb-4.0/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7
+FROM centos:8
 
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.name="Percona Server for MongoDB"
@@ -18,51 +18,37 @@ plus additional enterprise-grade functionality."
 LABEL org.opencontainers.image.license="SSPLv1"
 LABEL org.opencontainers.image.authors="info@percona.com"
 
-ENV PSMDB_VERSION 4.0.20-13
+ENV PSMDB_VERSION 4.0.20-14
+ENV OS_VER el8
+ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
+ENV K8S_TOOLS_VERSION "0.5.0"
 LABEL org.label-schema.schema-version=${PSMDB_VERSION}
 LABEL org.opencontainers.image.version=${PSMDB_VERSION}
 
 # check repository package signature in secure way
 RUN set -ex; \
     export GNUPGHOME="$(mktemp -d)"; \
-    gpg --batch --keyserver pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A; \
-    gpg --batch --keyserver pool.sks-keyservers.net --recv-keys 6341AB2753D78A78A7C27BB124C6A8A7F4A80EB5; \
-    gpg --batch --keyserver pool.sks-keyservers.net --recv-keys 91E97D7C4A5E96F17F3E888F6A2FAEA2352C64E5; \
-    \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 99DB70FAE1D7CE227FB6488205B555B38483C65D; \
     gpg --batch --export --armor 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A > ${GNUPGHOME}/RPM-GPG-KEY-Percona; \
-    gpg --batch --export --armor 6341AB2753D78A78A7C27BB124C6A8A7F4A80EB5 > ${GNUPGHOME}/RPM-GPG-KEY-CentOS-7; \
-    gpg --batch --export --armor 91E97D7C4A5E96F17F3E888F6A2FAEA2352C64E5 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-7; \
-    rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona ${GNUPGHOME}/RPM-GPG-KEY-CentOS-7 ${GNUPGHOME}/RPM-GPG-KEY-EPEL-7; \
-    \
+    gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \
+    rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \
     curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \
     rpmkeys --checksig /tmp/percona-release.rpm; \
-    rpm -i /tmp/percona-release.rpm; \
+    dnf install -y /tmp/percona-release.rpm; \
     rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
     rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY; \
     percona-release enable psmdb-40 release
 
-# install exact version for repeatability
-ENV OS_VER el7
-ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
-ENV K8S_TOOLS_VERSION "0.5.0"
-
-RUN set -ex; \
-    curl -Lf -o /tmp/jq.rpm https://download.fedoraproject.org/pub/epel/7/x86_64/Packages/j/jq-1.6-2.el7.x86_64.rpm; \
-    curl -Lf -o /tmp/oniguruma.rpm https://download.fedoraproject.org/pub/epel/7/x86_64/Packages/o/oniguruma-6.8.2-1.el7.x86_64.rpm; \
-    rpmkeys --checksig /tmp/jq.rpm /tmp/oniguruma.rpm; \
-    \
-    rpm -i /tmp/jq.rpm /tmp/oniguruma.rpm; \
-    rm -rf /tmp/jq.rpm /tmp/oniguruma.rpm
-
 RUN set -ex; \
-    sed -i '/nodocs/d' /etc/yum.conf || :; \
-    yum install -y \
+    dnf install -y \
         percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \
         percona-server-mongodb-shell-${FULL_PERCONA_VERSION} \
         shadow-utils \
         curl \
         procps-ng \
-        yum-utils; \
+        oniguruma \
+        jq \
+        dnf-utils; \
     \
     repoquery -a --location \
         policycoreutils \
@@ -73,8 +59,9 @@ RUN set -ex; \
     rpm -iv /tmp/policycoreutils.rpm /tmp/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.rpm --nodeps; \
     \
     rm -rf /tmp/policycoreutils.rpm /tmp/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.rpm; \
-    yum clean all; \
-    rm -rf /var/cache/yum /data/db && mkdir -p /data/db; \
+    dnf clean all; \
+    dnf -y remove dnf-utils; \
+    rm -rf /var/cache/dnf /data/db && mkdir -p /data/db; \
     chown -R 1001:0 /data/db
 
 # the numeric UID is needed for OpenShift
@@ -82,7 +69,7 @@ RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
             -c "Default Application User" mongodb
 
 COPY LICENSE /licenses/LICENSE.Dockerfile
-RUN cp /usr/share/doc/percona-server-mongodb-server-$(echo ${FULL_PERCONA_VERSION} | cut -d - -f 1)/LICENSE-Community.txt /licenses/LICENSE.Percona-Server-for-MongoDB
+RUN cp /usr/share/doc/percona-server-mongodb-server/LICENSE-Community.txt /licenses/LICENSE.Percona-Server-for-MongoDB
 
 ENV GOSU_VERSION=1.11
 RUN set -eux; \
diff --git a/percona_psmdb-4.2/Dockerfile b/percona_psmdb-4.2/Dockerfile
index add5eb5..09863ae 100644
--- a/percona_psmdb-4.2/Dockerfile
+++ b/percona_psmdb-4.2/Dockerfile
@@ -1,4 +1,4 @@
-FROM centos:7
+FROM centos:8
 
 LABEL org.label-schema.schema-version="1.0"
 LABEL org.label-schema.name="Percona Server for MongoDB"
@@ -18,51 +18,37 @@ plus additional enterprise-grade functionality."
 LABEL org.opencontainers.image.license="SSPLv1"
 LABEL org.opencontainers.image.authors="info@percona.com"
 
-ENV PSMDB_VERSION 4.2.9-9
+ENV PSMDB_VERSION 4.2.9-10
+ENV OS_VER el8
+ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
+ENV K8S_TOOLS_VERSION "0.5.0"
 LABEL org.label-schema.schema-version=${PSMDB_VERSION}
 LABEL org.opencontainers.image.version=${PSMDB_VERSION}
 
 # check repository package signature in secure way
 RUN set -ex; \
     export GNUPGHOME="$(mktemp -d)"; \
-    gpg --batch --keyserver pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A; \
-    gpg --batch --keyserver pool.sks-keyservers.net --recv-keys 6341AB2753D78A78A7C27BB124C6A8A7F4A80EB5; \
-    gpg --batch --keyserver pool.sks-keyservers.net --recv-keys 91E97D7C4A5E96F17F3E888F6A2FAEA2352C64E5; \
-    \
+    gpg --batch --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 99DB70FAE1D7CE227FB6488205B555B38483C65D; \
     gpg --batch --export --armor 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A > ${GNUPGHOME}/RPM-GPG-KEY-Percona; \
-    gpg --batch --export --armor 6341AB2753D78A78A7C27BB124C6A8A7F4A80EB5 > ${GNUPGHOME}/RPM-GPG-KEY-CentOS-7; \
-    gpg --batch --export --armor 91E97D7C4A5E96F17F3E888F6A2FAEA2352C64E5 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-7; \
-    rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona ${GNUPGHOME}/RPM-GPG-KEY-CentOS-7 ${GNUPGHOME}/RPM-GPG-KEY-EPEL-7; \
-    \
+    gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \
+    rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \
     curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \
     rpmkeys --checksig /tmp/percona-release.rpm; \
-    rpm -i /tmp/percona-release.rpm; \
+    dnf install -y /tmp/percona-release.rpm; \
     rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
     rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY; \
     percona-release enable psmdb-42 release
 
-# install exact version for repeatability
-ENV OS_VER el7
-ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
-ENV K8S_TOOLS_VERSION "0.5.0"
-
-RUN set -ex; \
-    curl -Lf -o /tmp/jq.rpm https://download.fedoraproject.org/pub/epel/7/x86_64/Packages/j/jq-1.6-2.el7.x86_64.rpm; \
-    curl -Lf -o /tmp/oniguruma.rpm https://download.fedoraproject.org/pub/epel/7/x86_64/Packages/o/oniguruma-6.8.2-1.el7.x86_64.rpm; \
-    rpmkeys --checksig /tmp/jq.rpm /tmp/oniguruma.rpm; \
-    \
-    rpm -i /tmp/jq.rpm /tmp/oniguruma.rpm; \
-    rm -rf /tmp/jq.rpm /tmp/oniguruma.rpm
-
 RUN set -ex; \
-    sed -i '/nodocs/d' /etc/yum.conf || :; \
-    yum install -y \
+    dnf install -y \
         percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \
         percona-server-mongodb-shell-${FULL_PERCONA_VERSION} \
         shadow-utils \
         curl \
         procps-ng \
-        yum-utils; \
+        oniguruma \
+        jq \
+        dnf-utils; \
         \
     repoquery -a --location \
         policycoreutils \
@@ -73,8 +59,9 @@ RUN set -ex; \
     rpm -iv /tmp/policycoreutils.rpm /tmp/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.rpm --nodeps; \
     \
     rm -rf /tmp/policycoreutils.rpm /tmp/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.rpm; \
-    yum clean all; \
-    rm -rf /var/cache/yum /data/db && mkdir -p /data/db; \
+    dnf clean all; \
+    dnf -y remove dnf-utils; \
+    rm -rf /var/cache/dnf /data/db && mkdir -p /data/db; \
     chown -R 1001:0 /data/db
 
 # the numeric UID is needed for OpenShift
@@ -82,7 +69,7 @@ RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
             -c "Default Application User" mongodb
 
 COPY LICENSE /licenses/LICENSE.Dockerfile
-RUN cp /usr/share/doc/percona-server-mongodb-server-$(echo ${FULL_PERCONA_VERSION} | cut -d - -f 1)/LICENSE-Community.txt /licenses/LICENSE.Percona-Server-for-MongoDB
+RUN cp /usr/share/doc/percona-server-mongodb-server/LICENSE-Community.txt /licenses/LICENSE.Percona-Server-for-MongoDB
 
 ENV GOSU_VERSION=1.11
 RUN set -eux; \
diff --git a/percona_psmdb-4.4/Dockerfile b/percona_psmdb-4.4/Dockerfile
index 82b6f9e..40ac80c 100644
--- a/percona_psmdb-4.4/Dockerfile
+++ b/percona_psmdb-4.4/Dockerfile
@@ -18,7 +18,7 @@ plus additional enterprise-grade functionality."
 LABEL org.opencontainers.image.license="SSPLv1"
 LABEL org.opencontainers.image.authors="info@percona.com"
 
-ENV PSMDB_VERSION 4.4.1-2
+ENV PSMDB_VERSION 4.4.1-3
 ENV OS_VER el8
 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
 ENV K8S_TOOLS_VERSION "0.5.0"

@tianon tianon merged commit df396a5 into docker-library:master Oct 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
library/percona
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@EvgeniyPatlan @tianon