Skip to content

Commit 6ff3f22

Browse files
author
MySQL Build Team
committed
Release version 1.1.11
 * Bump shell version to 8.0.16 * wl12360: Fix escaping of special characters in replacement string * wl12360: Use new --validate-config option for 8.0 * Remove unneeded flush privilege command * Bump versions for 1.1.11 release
1 parent 6c4af3b commit 6ff3f22

File tree

9 files changed

+19
-22
lines changed

9 files changed

+19
-22
lines changed

‎5.6/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515
FROM oraclelinux:7-slim
1616

17-
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-5.6.43
17+
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-5.6.44
1818
ARG MYSQL_SHELL_PACKAGE=
1919

2020
# Install server

‎5.6/docker-entrypoint.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1616
set -e
1717

18-
echo "[Entrypoint] MySQL Docker Image 5.6.43-1.1.10"
18+
echo "[Entrypoint] MySQL Docker Image 5.6.44-1.1.11"
1919
# Fetch value from server config
2020
# We use mysqld --verbose --help instead of my_print_defaults because the
2121
# latter only show values present in config files, and not server defaults
@@ -35,7 +35,7 @@ if [ "$1" = 'mysqld' ]; then
3535
# Test that the server can start. We redirect stdout to /dev/null so
3636
# only the error messages are left.
3737
result=0
38-
output=$("$@" --verbose --help 2>&1 > /dev/null) || result=$?
38+
output=$("$@" --verbose --help 2>%%VALIDATE_CONFIG%%1 > /dev/null) || result=$?
3939
if [ ! "$result" = "0" ]; then
4040
echo >&2 '[Entrypoint] ERROR: Unable to start MySQL. Please check your configuration.'
4141
echo >&2 "[Entrypoint] $output"
@@ -142,7 +142,6 @@ EOF
142142
echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" | "${mysql[@]}"
143143
fi
144144

145-
echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}"
146145
elif [ "$MYSQL_USER" -a ! "$MYSQL_PASSWORD" -o ! "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
147146
echo '[Entrypoint] Not creating mysql user. MYSQL_USER and MYSQL_PASSWORD must be specified to create a mysql user.'
148147
fi
@@ -202,7 +201,7 @@ password=healthcheckpass
202201
EOF
203202
touch /mysql-init-complete
204203
chown -R mysql:mysql "$DATADIR"
205-
echo "[Entrypoint] Starting MySQL 5.6.43-1.1.10"
204+
echo "[Entrypoint] Starting MySQL 5.6.44-1.1.11"
206205
fi
207206

208207
exec "$@"

‎5.6/inspec/control.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
impact 0.5
1313
describe package('mysql-community-server-minimal') do
1414
it { should be_installed }
15-
its ('version') { should match '5.6.43.*' }
15+
its ('version') { should match '5.6.44.*' }
1616
end
1717
end

‎5.7/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515
FROM oraclelinux:7-slim
1616

17-
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-5.7.25
18-
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.15
17+
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-5.7.26
18+
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.16
1919

2020
# Install server
2121
RUN yum install -y https://repo.mysql.com/mysql-community-minimal-release-el7.rpm \

‎5.7/docker-entrypoint.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1616
set -e
1717

18-
echo "[Entrypoint] MySQL Docker Image 5.7.25-1.1.10"
18+
echo "[Entrypoint] MySQL Docker Image 5.7.26-1.1.11"
1919
# Fetch value from server config
2020
# We use mysqld --verbose --help instead of my_print_defaults because the
2121
# latter only show values present in config files, and not server defaults
@@ -35,7 +35,7 @@ if [ "$1" = 'mysqld' ]; then
3535
# Test that the server can start. We redirect stdout to /dev/null so
3636
# only the error messages are left.
3737
result=0
38-
output=$("$@" --verbose --help 2>&1 > /dev/null) || result=$?
38+
output=$("$@" --verbose --help 2>%%VALIDATE_CONFIG%%1 > /dev/null) || result=$?
3939
if [ ! "$result" = "0" ]; then
4040
echo >&2 '[Entrypoint] ERROR: Unable to start MySQL. Please check your configuration.'
4141
echo >&2 "[Entrypoint] $output"
@@ -142,7 +142,6 @@ EOF
142142
echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" | "${mysql[@]}"
143143
fi
144144

145-
echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}"
146145
elif [ "$MYSQL_USER" -a ! "$MYSQL_PASSWORD" -o ! "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
147146
echo '[Entrypoint] Not creating mysql user. MYSQL_USER and MYSQL_PASSWORD must be specified to create a mysql user.'
148147
fi
@@ -202,7 +201,7 @@ password=healthcheckpass
202201
EOF
203202
touch /mysql-init-complete
204203
chown -R mysql:mysql "$DATADIR"
205-
echo "[Entrypoint] Starting MySQL 5.7.25-1.1.10"
204+
echo "[Entrypoint] Starting MySQL 5.7.26-1.1.11"
206205
fi
207206

208207
exec "$@"

‎5.7/inspec/control.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
impact 0.5
1313
describe package('mysql-community-server-minimal') do
1414
it { should be_installed }
15-
its ('version') { should match '5.7.25.*' }
15+
its ('version') { should match '5.7.26.*' }
1616
end
1717
end
1818
control 'shell-package' do
1919
impact 0.5
2020
describe package('mysql-shell') do
2121
it { should be_installed }
22-
its ('version') { should match '8.0.15.*' }
22+
its ('version') { should match '8.0.16.*' }
2323
end
2424
end

‎8.0/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1515
FROM oraclelinux:7-slim
1616

17-
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-8.0.15
18-
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.15
17+
ARG MYSQL_SERVER_PACKAGE=mysql-community-server-minimal-8.0.16
18+
ARG MYSQL_SHELL_PACKAGE=mysql-shell-8.0.16
1919

2020
# Install server
2121
RUN yum install -y https://repo.mysql.com/mysql-community-minimal-release-el7.rpm \

‎8.0/docker-entrypoint.sh

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
1616
set -e
1717

18-
echo "[Entrypoint] MySQL Docker Image 8.0.15-1.1.10"
18+
echo "[Entrypoint] MySQL Docker Image 8.0.16-1.1.11"
1919
# Fetch value from server config
2020
# We use mysqld --verbose --help instead of my_print_defaults because the
2121
# latter only show values present in config files, and not server defaults
@@ -35,7 +35,7 @@ if [ "$1" = 'mysqld' ]; then
3535
# Test that the server can start. We redirect stdout to /dev/null so
3636
# only the error messages are left.
3737
result=0
38-
output=$("$@" --verbose --help 2>&1 > /dev/null) || result=$?
38+
output=$("$@" --validate-config) || result=$?
3939
if [ ! "$result" = "0" ]; then
4040
echo >&2 '[Entrypoint] ERROR: Unable to start MySQL. Please check your configuration.'
4141
echo >&2 "[Entrypoint] $output"
@@ -142,7 +142,6 @@ EOF
142142
echo "GRANT ALL ON \`"$MYSQL_DATABASE"\`.* TO '"$MYSQL_USER"'@'%' ;" | "${mysql[@]}"
143143
fi
144144

145-
echo 'FLUSH PRIVILEGES ;' | "${mysql[@]}"
146145
elif [ "$MYSQL_USER" -a ! "$MYSQL_PASSWORD" -o ! "$MYSQL_USER" -a "$MYSQL_PASSWORD" ]; then
147146
echo '[Entrypoint] Not creating mysql user. MYSQL_USER and MYSQL_PASSWORD must be specified to create a mysql user.'
148147
fi
@@ -202,7 +201,7 @@ password=healthcheckpass
202201
EOF
203202
touch /mysql-init-complete
204203
chown -R mysql:mysql "$DATADIR"
205-
echo "[Entrypoint] Starting MySQL 8.0.15-1.1.10"
204+
echo "[Entrypoint] Starting MySQL 8.0.16-1.1.11"
206205
fi
207206

208207
exec "$@"

‎8.0/inspec/control.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
impact 0.5
1313
describe package('mysql-community-server-minimal') do
1414
it { should be_installed }
15-
its ('version') { should match '8.0.15.*' }
15+
its ('version') { should match '8.0.16.*' }
1616
end
1717
end
1818
control 'shell-package' do
1919
impact 0.5
2020
describe package('mysql-shell') do
2121
it { should be_installed }
22-
its ('version') { should match '8.0.15.*' }
22+
its ('version') { should match '8.0.16.*' }
2323
end
2424
end

0 commit comments

Comments
 (0)