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.

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

[percona] Update psmdb-5.0 version #12268

Merged
merged 1 commit into from
Apr 20, 2022

Conversation

vorsel
Copy link
Contributor

@vorsel vorsel commented Apr 20, 2022

  1. update psmdb-5.0 version
  2. change base image to oraclelinux.
  3. move ENV declarations to the place where they were before.

@github-actions
Copy link

Diff for c67929d:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index d8531cf..559f306 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -32,6 +32,6 @@ Tags: psmdb-4.4.13, psmdb-4.4
 GitCommit: 8d6335b61f2e36781f15b2b3d47443288b5c0714
 Directory: percona-server-mongodb-4.4
 
-Tags: psmdb-5.0.3, psmdb-5.0
-GitCommit: dc3e493a92bc2de19cb6877adb155fd4c255fd52
+Tags: psmdb-5.0.7, psmdb-5.0
+GitCommit: f4f93f0d6e5565cea9c1c9362aff2869d892e74c
 Directory: percona-server-mongodb-5.0
diff --git a/_bashbrew-list b/_bashbrew-list
index 4742c26..aad8a08 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -25,7 +25,7 @@ percona:psmdb-4.2.19
 percona:psmdb-4.4
 percona:psmdb-4.4.13
 percona:psmdb-5.0
-percona:psmdb-5.0.3
+percona:psmdb-5.0.7
 percona:ps-5
 percona:ps-5.6
 percona:ps-5.6.51-2
diff --git a/percona_psmdb-5.0/Dockerfile b/percona_psmdb-5.0/Dockerfile
index 0ec64a5..188da0b 100644
--- a/percona_psmdb-5.0/Dockerfile
+++ b/percona_psmdb-5.0/Dockerfile
@@ -1,49 +1,43 @@
-FROM centos:8
+FROM oraclelinux:8
 
 LABEL org.opencontainers.image.authors="info@percona.com"
 
 # check repository package signature in secure way
 RUN set -ex; \
     export GNUPGHOME="$(mktemp -d)"; \
-    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 99DB70FAE1D7CE227FB6488205B555B38483C65D; \
+    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A 99DB70FAE1D7CE227FB6488205B555B38483C65D 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1; \
     gpg --batch --export --armor 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A > ${GNUPGHOME}/RPM-GPG-KEY-Percona; \
     gpg --batch --export --armor 99DB70FAE1D7CE227FB6488205B555B38483C65D > ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \
-    rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona ${GNUPGHOME}/RPM-GPG-KEY-centosofficial; \
+    gpg --batch --export --armor 94E279EB8D8F25B21810ADF121EA45AB2F86D6A1 > ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \
+    rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona ${GNUPGHOME}/RPM-GPG-KEY-centosofficial ${GNUPGHOME}/RPM-GPG-KEY-EPEL-8; \
     curl -Lf -o /tmp/percona-release.rpm https://repo.percona.com/yum/percona-release-latest.noarch.rpm; \
     rpmkeys --checksig /tmp/percona-release.rpm; \
-    dnf install -y /tmp/percona-release.rpm; \
+    rpm -i /tmp/percona-release.rpm; \
     rm -rf "$GNUPGHOME" /tmp/percona-release.rpm; \
     rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY; \
     percona-release enable psmdb-50 release
 
-ENV PSMDB_VERSION 5.0.3-2
+ENV PSMDB_VERSION 5.0.7-6
 ENV OS_VER el8
 ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
 ENV K8S_TOOLS_VERSION "0.5.0"
 
 RUN set -ex; \
-    dnf install -y \
+    dnf -y install \
         percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \
         percona-server-mongodb-shell-${FULL_PERCONA_VERSION} \
-        shadow-utils \
-        curl \
         procps-ng \
-        oniguruma \
         jq \
-        dnf-utils; \
-        \
-    repoquery -a --location \
-        policycoreutils \
-            | xargs curl -Lf -o /tmp/policycoreutils.rpm; \
-    repoquery -a --location \
-        percona-server-mongodb-server-${FULL_PERCONA_VERSION} \
-            | xargs curl -Lf -o /tmp/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.rpm; \
-    rpm -iv /tmp/policycoreutils.rpm /tmp/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.rpm --nodeps; \
+        tar \
+        oniguruma \
+        policycoreutils; \
         \
-    rm -rf /tmp/policycoreutils.rpm /tmp/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.rpm; \
+    curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-50/yum/release/8/RPMS/x86_64/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.x86_64.rpm; \
+    rpmkeys --checksig /tmp/Percona-Server-MongoDB-server.rpm; \
+    rpm -iv /tmp/Percona-Server-MongoDB-server.rpm --nodeps; \
+    rm -rf /tmp/Percona-Server-MongoDB-server.rpm; \
     dnf clean all; \
-    dnf -y remove dnf-utils; \
-    rm -rf /var/cache/dnf /data/db && mkdir -p /data/db; \
+    rm -rf /var/cache/dnf /var/cache/yum /data/db && mkdir -p /data/db; \
     chown -R 1001:0 /data/db
 
 # the numeric UID is needed for OpenShift
@@ -76,14 +70,14 @@ RUN set -ex; \
     \
     chmod 0755 /usr/local/bin/k8s-mongodb-initiator /usr/local/bin/mongodb-healthcheck
 
+VOLUME ["/data/db"]
+
 RUN set -ex; \
     curl -fSL https://cdnjs.cloudflare.com/ajax/libs/js-yaml/4.1.0/js-yaml.min.js -o /js-yaml.js; \
     echo "45dc3dd03dc07a06705a2c2989b8c7f709013f04bd5386e3279d4e447f07ebd7  /js-yaml.js" | sha256sum -c -
 
 COPY ps-entry.sh /entrypoint.sh
 
-VOLUME ["/data/db"]
-
 ENTRYPOINT ["/entrypoint.sh"]
 
 EXPOSE 27017

Relevant Maintainers:

@yosifkit
Copy link
Member

Ignoring failing builds that are unchanged in this PR.

@yosifkit yosifkit merged commit aa9fcb8 into docker-library:master Apr 20, 2022
@yosifkit
Copy link
Member

Just an FYI that this build will be slow since the build queue is very full from the Debian update that was merged yesterday (#12257).

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants