-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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 ps-57 version #5965
Merged
Merged
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
Diff:diff --git a/_bashbrew-list b/_bashbrew-list
index a26b4ad..7d2e4ba 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -6,8 +6,8 @@ percona:5.6.44
percona:5.6.44-centos
percona:5.7
percona:5.7-centos
-percona:5.7.25
-percona:5.7.25-centos
+percona:5.7.26
+percona:5.7.26-centos
percona:8
percona:8-centos
percona:8.0
@@ -24,7 +24,7 @@ percona:ps-5
percona:ps-5.6
percona:ps-5.6.44
percona:ps-5.7
-percona:ps-5.7.25
+percona:ps-5.7.26
percona:ps-8
percona:ps-8.0
percona:ps-8.0.15-6
diff --git a/percona_latest/Dockerfile-dockerhub b/percona_latest/Dockerfile-dockerhub
index d7721e1..898b11a 100644
--- a/percona_latest/Dockerfile-dockerhub
+++ b/percona_latest/Dockerfile-dockerhub
@@ -17,7 +17,7 @@ RUN export GNUPGHOME="$(mktemp -d)" \
&& percona-release enable original release
# install exact version of PS for repeatability
-ENV PERCONA_VERSION 5.7.25-28.1.el7
+ENV PERCONA_VERSION 5.7.26-29.1.el7
RUN yum install -y \
Percona-Server-server-57-${PERCONA_VERSION} \
diff --git a/percona_latest/ps-entry.sh b/percona_latest/ps-entry.sh
index ff39d5b..da9088c 100755
--- a/percona_latest/ps-entry.sh
+++ b/percona_latest/ps-entry.sh
@@ -117,7 +117,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
"$@" --skip-networking --socket="${SOCKET}" &
pid="$!"
- mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" )
+ mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" --password="" )
for i in {120..0}; do
if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then
@@ -216,6 +216,12 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
echo 'MySQL init process done. Ready for start up.'
echo
fi
+
+ # exit when MYSQL_INIT_ONLY environment variable is set to avoid starting mysqld
+ if [ ! -z "$MYSQL_INIT_ONLY" ]; then
+ echo 'Initialization complete, now exiting!'
+ exit 0
+ fi
fi
exec "$@" |
Build test of #5965; 54193b1; $ bashbrew build percona:8.0.15-6-centos
Using bashbrew/cache:87b8af0bb9b0267d1e2b20957cc70ee14d9bc8a5c2192dae126241677d07b14a (percona:8.0.15-6-centos)
Tagging percona:8.0.15-6-centos
Tagging percona:8.0-centos
Tagging percona:8-centos
Tagging percona:8.0.15-6
Tagging percona:8.0
Tagging percona:8
Tagging percona:ps-8.0.15-6
Tagging percona:ps-8.0
Tagging percona:ps-8
$ test/run.sh percona:8.0.15-6-centos
testing percona:8.0.15-6-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.26-centos
Building bashbrew/cache:b6c1e3f2920bc999d790da367352e842f5dc549cd6f332e7c10e0df48b00f81e (percona:5.7.26-centos)
Tagging percona:5.7.26-centos
Tagging percona:5.7-centos
Tagging percona:5-centos
Tagging percona:centos
Tagging percona:5.7.26
Tagging percona:5.7
Tagging percona:5
Tagging percona:ps-5.7.26
Tagging percona:ps-5.7
Tagging percona:ps-5
Tagging percona:latest
$ test/run.sh percona:5.7.26-centos
testing percona:5.7.26-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.44-centos
Using bashbrew/cache:f0dd9fb7e3cf6bef52a7f52093e3e6097a587d845bec074a5561afe5b890e657 (percona:5.6.44-centos)
Tagging percona:5.6.44-centos
Tagging percona:5.6-centos
Tagging percona:5.6.44
Tagging percona:5.6
Tagging percona:ps-5.6.44
Tagging percona:ps-5.6
$ test/run.sh percona:5.6.44-centos
testing percona:5.6.44-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.9
Using bashbrew/cache:c81b33ee0d7cbf8e05fa2bdea20f14325dbce355cc991b0ca4c2bbb92076d059 (percona:psmdb-4.0.9)
Tagging percona:psmdb-4.0.9
Tagging percona:psmdb-4.0
$ test/run.sh percona:psmdb-4.0.9
testing percona:psmdb-4.0.9
'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.12
Using bashbrew/cache:50fe48b40e7f2c99fb26f5e3627a4fe4717d3da7569a5df358904386e2430013 (percona:psmdb-3.6.12)
Tagging percona:psmdb-3.6.12
Tagging percona:psmdb-3.6
$ test/run.sh percona:psmdb-3.6.12
testing percona:psmdb-3.6.12
'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.