[percona] psmdb-4.0.5 #5450
Merged
[percona] psmdb-4.0.5 #5450
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
delgod
approved these changes
Feb 18, 2019
Diff:diff --git a/_bashbrew-arches b/_bashbrew-arches
index 10cdc92..c1d490e 100644
--- a/_bashbrew-arches
+++ b/_bashbrew-arches
@@ -1,4 +1,5 @@
percona:latest @ amd64
percona:psmdb-3.6 @ amd64
+percona:psmdb-4.0 @ amd64
percona:ps-5.6 @ amd64
percona:ps-8 @ amd64
diff --git a/_bashbrew-list b/_bashbrew-list
index d645ee9..7d5dc0c 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,8 +6,8 @@ percona:5.6.43
percona:5.6.43-centos
percona:5.7
percona:5.7-centos
-percona:5.7.24
-percona:5.7.24-centos
+percona:5.7.25
+percona:5.7.25-centos
percona:8
percona:8-centos
percona:8.0
@@ -17,12 +17,14 @@ percona:8.0.13-4-centos
percona:centos
percona:latest
percona:psmdb-3.6
-percona:psmdb-3.6.8
+percona:psmdb-3.6.10
+percona:psmdb-4.0
+percona:psmdb-4.0.5
percona:ps-5
percona:ps-5.6
percona:ps-5.6.43
percona:ps-5.7
-percona:ps-5.7.24
+percona:ps-5.7.25
percona:ps-8
percona:ps-8.0
percona:ps-8.0.13-4
diff --git a/percona_latest/Dockerfile-dockerhub b/percona_latest/Dockerfile-dockerhub
index cb04381..d7721e1 100644
--- a/percona_latest/Dockerfile-dockerhub
+++ b/percona_latest/Dockerfile-dockerhub
@@ -10,13 +10,14 @@ RUN export GNUPGHOME="$(mktemp -d)" \
&& gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
&& gpg --export --armor 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A > ${GNUPGHOME}/RPM-GPG-KEY-Percona \
&& rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \
- && curl -L -o /tmp/percona-release.rpm http://www.percona.com/downloads/percona-release/redhat/0.1-6/percona-release-0.1-6.noarch.rpm \
+ && curl -L -o /tmp/percona-release.rpm https://repo.percona.com/percona/yum/percona-release-0.1-10.noarch.rpm \
&& rpmkeys --checksig /tmp/percona-release.rpm \
&& yum install -y /tmp/percona-release.rpm \
- && rm -rf "$GNUPGHOME" /tmp/percona-release.rpm
+ && rm -rf "$GNUPGHOME" /tmp/percona-release.rpm \
+ && percona-release enable original release
# install exact version of PS for repeatability
-ENV PERCONA_VERSION 5.7.24-26.1.el7
+ENV PERCONA_VERSION 5.7.25-28.1.el7
RUN yum install -y \
Percona-Server-server-57-${PERCONA_VERSION} \
diff --git a/percona_psmdb-3.6/Dockerfile b/percona_psmdb-3.6/Dockerfile
index b625450..4a0afba 100644
--- a/percona_psmdb-3.6/Dockerfile
+++ b/percona_psmdb-3.6/Dockerfile
@@ -3,25 +3,31 @@ MAINTAINER Percona Development <info@percona.com>
# check repository package signature in secure way
RUN export GNUPGHOME="$(mktemp -d)" \
- && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
+ && gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
&& gpg --export --armor 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A > ${GNUPGHOME}/RPM-GPG-KEY-Percona \
&& rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \
- && curl -L -o /tmp/percona-release.rpm http://www.percona.com/downloads/percona-release/redhat/0.1-6/percona-release-0.1-6.noarch.rpm \
+ && curl -L -o /tmp/percona-release.rpm https://repo.percona.com/percona/yum/percona-release-1.0-7.noarch.rpm \
&& rpmkeys --checksig /tmp/percona-release.rpm \
&& yum install -y /tmp/percona-release.rpm \
- && rm -rf "$GNUPGHOME" /tmp/percona-release.rpm
+ && rm -rf "$GNUPGHOME" /tmp/percona-release.rpm \
+ && rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY \
+ && percona-release disable all \
+ && percona-release enable original release
# the numeric UID is needed for OpenShift
RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
-c "Default Application User" mongodb
ENV PERCONA_MAJOR 36
-ENV PERCONA_VERSION 3.6.8-2.0.el7
+ENV PERCONA_VERSION 3.6.10-3.0.el7
ENV K8S_TOOLS_VERSION 0.4.1
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& yum install -y \
Percona-Server-MongoDB-36-server-${PERCONA_VERSION} \
+ Percona-Server-MongoDB-36-mongos-${PERCONA_VERSION} \
+ Percona-Server-MongoDB-36-tools-${PERCONA_VERSION} \
+ Percona-Server-MongoDB-36-shell-${PERCONA_VERSION} \
curl \
jq \
&& yum clean all \
diff --git a/percona_psmdb-3.6/Dockerfile b/percona_psmdb-4.0/Dockerfile
similarity index 65%
copy from percona_psmdb-3.6/Dockerfile
copy to percona_psmdb-4.0/Dockerfile
index b625450..7470ec9 100644
--- a/percona_psmdb-3.6/Dockerfile
+++ b/percona_psmdb-4.0/Dockerfile
@@ -3,25 +3,31 @@ MAINTAINER Percona Development <info@percona.com>
# check repository package signature in secure way
RUN export GNUPGHOME="$(mktemp -d)" \
- && gpg --keyserver ha.pool.sks-keyservers.net --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
+ && gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A \
&& gpg --export --armor 430BDF5C56E7C94E848EE60C1C4CBDCDCD2EFD2A > ${GNUPGHOME}/RPM-GPG-KEY-Percona \
&& rpmkeys --import ${GNUPGHOME}/RPM-GPG-KEY-Percona /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 \
- && curl -L -o /tmp/percona-release.rpm http://www.percona.com/downloads/percona-release/redhat/0.1-6/percona-release-0.1-6.noarch.rpm \
+ && curl -L -o /tmp/percona-release.rpm https://repo.percona.com/percona/yum/percona-release-1.0-7.noarch.rpm \
&& rpmkeys --checksig /tmp/percona-release.rpm \
&& yum install -y /tmp/percona-release.rpm \
- && rm -rf "$GNUPGHOME" /tmp/percona-release.rpm
+ && rm -rf "$GNUPGHOME" /tmp/percona-release.rpm \
+ && rpm --import /etc/pki/rpm-gpg/PERCONA-PACKAGING-KEY \
+ && percona-release disable all \
+ && percona-release enable psmdb-40 release
# the numeric UID is needed for OpenShift
RUN useradd -u 1001 -r -g 0 -s /sbin/nologin \
-c "Default Application User" mongodb
-ENV PERCONA_MAJOR 36
-ENV PERCONA_VERSION 3.6.8-2.0.el7
+ENV PERCONA_MAJOR 40
+ENV PERCONA_VERSION 4.0.5-2.el7
ENV K8S_TOOLS_VERSION 0.4.1
RUN yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \
&& yum install -y \
- Percona-Server-MongoDB-36-server-${PERCONA_VERSION} \
+ percona-server-mongodb-server-${PERCONA_VERSION} \
+ percona-server-mongodb-mongos-${PERCONA_VERSION} \
+ percona-server-mongodb-shell-${PERCONA_VERSION} \
+ percona-server-mongodb-tools-${PERCONA_VERSION} \
curl \
jq \
&& yum clean all \
diff --git a/percona_psmdb-3.6/ps-entry.sh b/percona_psmdb-4.0/ps-entry.sh
similarity index 100%
copy from percona_psmdb-3.6/ps-entry.sh
copy to percona_psmdb-4.0/ps-entry.sh |
|
LGTM Build test of #5450; dc7100c; $ bashbrew build percona:8.0.13-4-centos
Using bashbrew/cache:b7c0c7e19486da91514e62171aaf635998197db2914523e927bb98f9594ce70e (percona:8.0.13-4-centos)
Tagging percona:8.0.13-4-centos
Tagging percona:8.0-centos
Tagging percona:8-centos
Tagging percona:8.0.13-4
Tagging percona:8.0
Tagging percona:8
Tagging percona:ps-8.0.13-4
Tagging percona:ps-8.0
Tagging percona:ps-8
$ test/run.sh percona:8.0.13-4-centos
testing percona:8.0.13-4-centos
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...warning: garbage password detected for 'root': 'locked'
passed
'override-cmd' [4/9]...passed
'mysql-basics' [5/9]........passed
'mysql-initdb' [6/9]........passed
'mysql-log-bin' [7/9]........passed
'percona-tokudb' [8/9]........passed
'percona-rocksdb' [9/9]........passed
$ bashbrew build percona:5.7.25-centos
Building bashbrew/cache:e912a5ceb3ade044bcab6e3e8b10c16ef455a5ffc36f531270f4670e11bc6a88 (percona:5.7.25-centos)
Tagging percona:5.7.25-centos
Tagging percona:5.7-centos
Tagging percona:5-centos
Tagging percona:centos
Tagging percona:5.7.25
Tagging percona:5.7
Tagging percona:5
Tagging percona:ps-5.7.25
Tagging percona:ps-5.7
Tagging percona:ps-5
Tagging percona:latest
$ test/run.sh percona:5.7.25-centos
testing percona:5.7.25-centos
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...warning: garbage password detected for 'root': 'locked'
passed
'override-cmd' [4/9]...passed
'mysql-basics' [5/9]......passed
'mysql-initdb' [6/9]......passed
'mysql-log-bin' [7/9].......passed
'percona-tokudb' [8/9].......passed
'percona-rocksdb' [9/9]......passed
$ bashbrew build percona:5.6.43-centos
Using bashbrew/cache:cb947a8c39a9852a6c15efa2873ccbb140947f0aec87b2939f9dbee1122dc2fa (percona:5.6.43-centos)
Tagging percona:5.6.43-centos
Tagging percona:5.6-centos
Tagging percona:5.6.43
Tagging percona:5.6
Tagging percona:ps-5.6.43
Tagging percona:ps-5.6
$ test/run.sh percona:5.6.43-centos
testing percona:5.6.43-centos
'utc' [1/9]...passed
'cve-2014--shellshock' [2/9]...passed
'no-hard-coded-passwords' [3/9]...warning: garbage password detected for 'root': 'locked'
passed
'override-cmd' [4/9]...passed
'mysql-basics' [5/9].......passed
'mysql-initdb' [6/9]........passed
'mysql-log-bin' [7/9]........passed
'percona-tokudb' [8/9]........passed
'percona-rocksdb' [9/9]...passed
$ bashbrew build percona:psmdb-4.0.5
Building bashbrew/cache:905a923a49f7b7477ad57849ac4404e8b0c2cd4e0cb22819e6b5f51bcd54d525 (percona:psmdb-4.0.5)
Tagging percona:psmdb-4.0.5
Tagging percona:psmdb-4.0
$ test/run.sh percona:psmdb-4.0.5
testing percona:psmdb-4.0.5
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...warning: garbage password detected for 'root': 'locked'
passed
'override-cmd' [4/6]...passed
'mongo-basics' [5/6]....passed
'mongo-auth-basics' [6/6]....passed
$ bashbrew build percona:psmdb-3.6.10
Building bashbrew/cache:b558599339529e6251355b21804f3faef7fbba4ed9713c3d4d0128a0fa54c961 (percona:psmdb-3.6.10)
Tagging percona:psmdb-3.6.10
Tagging percona:psmdb-3.6
$ test/run.sh percona:psmdb-3.6.10
testing percona:psmdb-3.6.10
'utc' [1/6]...passed
'cve-2014--shellshock' [2/6]...passed
'no-hard-coded-passwords' [3/6]...warning: garbage password detected for 'root': 'locked'
passed
'override-cmd' [4/6]...passed
'mongo-basics' [5/6]...passed
'mongo-auth-basics' [6/6]....passed
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.