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-44 version #11302

Closed
wants to merge 1 commit into from

Conversation

vorsel
Copy link
Contributor

@vorsel vorsel commented Nov 15, 2021

No description provided.

@github-actions
Copy link

Diff for e6db57e:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index fe6ab7d..5f29f93 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -28,8 +28,8 @@ Tags: psmdb-4.2.17, psmdb-4.2
 GitCommit: e4a1fcc85ae4668288429738f28f830b89382d50
 Directory: percona-server-mongodb-4.2
 
-Tags: psmdb-4.4.9, psmdb-4.4
-GitCommit: e840c5f10cb4d9564bb906ac4be446fd0f01501b
+Tags: psmdb-4.4.10, psmdb-4.4
+GitCommit: 26ace74d99c25e004bbc2c700ba167ea24694441
 Directory: percona-server-mongodb-4.4
 
 Tags: psmdb-5.0.3, psmdb-5.0
diff --git a/_bashbrew-list b/_bashbrew-list
index ea7395c..ff585c1 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -23,7 +23,7 @@ percona:psmdb-4.0.27
 percona:psmdb-4.2
 percona:psmdb-4.2.17
 percona:psmdb-4.4
-percona:psmdb-4.4.9
+percona:psmdb-4.4.10
 percona:psmdb-5.0
 percona:psmdb-5.0.3
 percona:ps-5
diff --git a/percona_psmdb-4.4/Dockerfile b/percona_psmdb-4.4/Dockerfile
index 86865ee..8bd4962 100644
--- a/percona_psmdb-4.4/Dockerfile
+++ b/percona_psmdb-4.4/Dockerfile
@@ -1,48 +1,50 @@
-FROM centos:8
+FROM redhat/ubi8-minimal
 
 LABEL org.opencontainers.image.authors="info@percona.com"
 
+ENV PSMDB_VERSION 4.4.10-11
+ENV OS_VER el8
+ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
+ENV K8S_TOOLS_VERSION "0.5.0"
+
 # 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; \
+    microdnf install -y findutils; \
     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-44 release
 
-ENV PSMDB_VERSION 4.4.9-10
-ENV OS_VER el8
-ENV FULL_PERCONA_VERSION "$PSMDB_VERSION.$OS_VER"
-ENV K8S_TOOLS_VERSION "0.5.0"
+RUN set -ex; \
+    curl -Lf -o /tmp/jq.rpm http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/jq-1.5-12.el8.x86_64.rpm; \
+    curl -Lf -o /tmp/oniguruma.rpm http://mirror.centos.org/centos/8/AppStream/x86_64/os/Packages/oniguruma-6.8.2-2.el8.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; \
-    dnf install -y \
+    microdnf install -y \
         percona-server-mongodb-mongos-${FULL_PERCONA_VERSION} \
         percona-server-mongodb-shell-${FULL_PERCONA_VERSION} \
         shadow-utils \
         curl \
         procps-ng \
-        oniguruma \
-        jq \
-        dnf-utils; \
+        policycoreutils; \
         \
-    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; \
-    \
-    rm -rf /tmp/policycoreutils.rpm /tmp/percona-server-mongodb-server-${FULL_PERCONA_VERSION}.rpm; \
-    dnf clean all; \
-    dnf -y remove dnf-utils; \
+    curl -Lf -o /tmp/Percona-Server-MongoDB-server.rpm http://repo.percona.com/psmdb-44/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; \
+    microdnf clean all; \
     rm -rf /var/cache/dnf /data/db && mkdir -p /data/db; \
     chown -R 1001:0 /data/db
 
@@ -76,14 +78,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

No official images can be derived from, or depend on, non-official images

- https://github.com/docker-library/official-images/tree/46d863e2284f741e59d712b9623595faa5799b41#repeatability

See also #9445

@vorsel
Copy link
Contributor Author

vorsel commented Nov 15, 2021

Thanks, @yosifkit, got it, checking the provided references...

@vorsel
Copy link
Contributor Author

vorsel commented Mar 24, 2022

Closing the PR since it's outdated.

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