Skip to content

Commit 97b0685

Browse files
author
MySQL Build Team
committed
Generated version files for 1.1.1
1 parent b985eb1 commit 97b0685

File tree

7 files changed

+32
-19
lines changed

7 files changed

+32
-19
lines changed

5.5/docker-entrypoint.sh

Lines changed: 6 additions & 3 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.5.58-1.1.1"
18+
echo "[Entrypoint] MySQL Docker Image 5.5.57-1.1.1"
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
@@ -47,7 +47,10 @@ if [ "$1" = 'mysqld' ]; then
4747
SOCKET="$(_get_config 'socket' "$@")"
4848

4949
if [ -n "$MYSQL_LOG_CONSOLE" ] || [ -n "" ]; then
50-
sed -i 's/^log-error=/#&/' /etc/my.cnf
50+
# Don't touch bind-mounted config files
51+
if ! cat /proc/1/mounts | grep "etc/my.cnf"; then
52+
sed -i 's/^log-error=/#&/' /etc/my.cnf
53+
fi
5154
fi
5255

5356
if [ ! -d "$DATADIR/mysql" ]; then
@@ -199,7 +202,7 @@ password=healthcheckpass
199202
EOF
200203
touch /mysql-init-complete
201204
chown -R mysql:mysql "$DATADIR"
202-
echo "[Entrypoint] Starting MySQL 5.5.58-1.1.1"
205+
echo "[Entrypoint] Starting MySQL 5.5.57-1.1.1"
203206
fi
204207

205208
exec "$@"

5.6/docker-entrypoint.sh

Lines changed: 6 additions & 3 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.38-1.1.1"
18+
echo "[Entrypoint] MySQL Docker Image 5.6.37-1.1.1"
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
@@ -47,7 +47,10 @@ if [ "$1" = 'mysqld' ]; then
4747
SOCKET="$(_get_config 'socket' "$@")"
4848

4949
if [ -n "$MYSQL_LOG_CONSOLE" ] || [ -n "" ]; then
50-
sed -i 's/^log-error=/#&/' /etc/my.cnf
50+
# Don't touch bind-mounted config files
51+
if ! cat /proc/1/mounts | grep "etc/my.cnf"; then
52+
sed -i 's/^log-error=/#&/' /etc/my.cnf
53+
fi
5154
fi
5255

5356
if [ ! -d "$DATADIR/mysql" ]; then
@@ -199,7 +202,7 @@ password=healthcheckpass
199202
EOF
200203
touch /mysql-init-complete
201204
chown -R mysql:mysql "$DATADIR"
202-
echo "[Entrypoint] Starting MySQL 5.6.38-1.1.1"
205+
echo "[Entrypoint] Starting MySQL 5.6.37-1.1.1"
203206
fi
204207

205208
exec "$@"

5.7/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
FROM oraclelinux:7-slim
1616

1717
ARG PACKAGE_URL=https://repo.mysql.com/yum/mysql-5.7-community/docker/x86_64/mysql-community-server-minimal-5.7.19-1.el7.x86_64.rpm
18-
ARG PACKAGE_URL_SHELL=https://repo.mysql.com/yum/mysql-tools-community/el/7/x86_64/mysql-shell-1.0.9-1.el7.x86_64.rpm
18+
ARG PACKAGE_URL_SHELL=https://repo.mysql.com/yum/mysql-tools-community/el/7/x86_64/mysql-shell-1.0.10-1.el7.x86_64.rpm
1919

2020
# Install server
2121
RUN rpmkeys --import https://repo.mysql.com/RPM-GPG-KEY-mysql \

5.7/docker-entrypoint.sh

Lines changed: 6 additions & 3 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.20-1.1.1"
18+
echo "[Entrypoint] MySQL Docker Image 5.7.19-1.1.1"
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
@@ -47,7 +47,10 @@ if [ "$1" = 'mysqld' ]; then
4747
SOCKET="$(_get_config 'socket' "$@")"
4848

4949
if [ -n "$MYSQL_LOG_CONSOLE" ] || [ -n "" ]; then
50-
sed -i 's/^log-error=/#&/' /etc/my.cnf
50+
# Don't touch bind-mounted config files
51+
if ! cat /proc/1/mounts | grep "etc/my.cnf"; then
52+
sed -i 's/^log-error=/#&/' /etc/my.cnf
53+
fi
5154
fi
5255

5356
if [ ! -d "$DATADIR/mysql" ]; then
@@ -199,7 +202,7 @@ password=healthcheckpass
199202
EOF
200203
touch /mysql-init-complete
201204
chown -R mysql:mysql "$DATADIR"
202-
echo "[Entrypoint] Starting MySQL 5.7.20-1.1.1"
205+
echo "[Entrypoint] Starting MySQL 5.7.19-1.1.1"
203206
fi
204207

205208
exec "$@"

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 PACKAGE_URL=https://repo.mysql.com/yum/mysql-8.0-community/docker/x86_64/mysql-community-server-minimal-8.0.2-0.1.dmr.el7.x86_64.rpm
18-
ARG PACKAGE_URL_SHELL=https://repo.mysql.com/yum/mysql-tools-community/el/7/x86_64/mysql-shell-1.0.9-1.el7.x86_64.rpm
17+
ARG PACKAGE_URL=https://repo.mysql.com/yum/mysql-8.0-community/docker/x86_64/mysql-community-server-minimal-8.0.3-0.1.rc.el7.x86_64.rpm
18+
ARG PACKAGE_URL_SHELL=https://repo.mysql.com/yum/mysql-tools-preview/el/7/x86_64/mysql-shell-8.0.0-0.1.dmr.el7.x86_64.rpm
1919

2020
# Install server
2121
RUN rpmkeys --import https://repo.mysql.com/RPM-GPG-KEY-mysql \

8.0/docker-entrypoint.sh

Lines changed: 6 additions & 3 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.3-dmr-1.1.1"
18+
echo "[Entrypoint] MySQL Docker Image 8.0.3-1.1.1"
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
@@ -47,7 +47,10 @@ if [ "$1" = 'mysqld' ]; then
4747
SOCKET="$(_get_config 'socket' "$@")"
4848

4949
if [ -n "$MYSQL_LOG_CONSOLE" ] || [ -n "console" ]; then
50-
sed -i 's/^log-error=/#&/' /etc/my.cnf
50+
# Don't touch bind-mounted config files
51+
if ! cat /proc/1/mounts | grep "etc/my.cnf"; then
52+
sed -i 's/^log-error=/#&/' /etc/my.cnf
53+
fi
5154
fi
5255

5356
if [ ! -d "$DATADIR/mysql" ]; then
@@ -199,7 +202,7 @@ password=healthcheckpass
199202
EOF
200203
touch /mysql-init-complete
201204
chown -R mysql:mysql "$DATADIR"
202-
echo "[Entrypoint] Starting MySQL 8.0.3-dmr-1.1.1"
205+
echo "[Entrypoint] Starting MySQL 8.0.3-1.1.1"
203206
fi
204207

205208
exec "$@"

changelog

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
Changes in 1.1.1 (not released)
1+
Changes in 1.1.1 (2017-09-22)
22
* Disable binlog for all entrypoint client commands (#87305)
33
This was previously only done only for the script to set the root password,
44
but should be done for all client commands, or group replication will fail
55
* Add flag for logging to console (#87458)
66
Setting -e MYSQL_LOG_CONSOLE=true will make the server log to console, so the
77
server log is available through Docker's log interface. If /etc/my.cnf is
8-
mounted from the host system, this has no effect.
8+
mounted from the host system, this has no effect. On 8.0, this is the default
9+
behavior.
910
* Ensure both MYSQL_USER and MYSQL_PASSWORD are set (#86982)
1011
Before, setting only one would cause the option to be silently ignored.
1112
* Read password file first and throw error if it is empty (#87025)
@@ -18,6 +19,8 @@ Changes in 1.1.1 (not released)
1819
If the MYSQL_ROOT_HOST variable is set we add an additional root user for
1920
the given host. This user was missing the PROXY privilege. We add the
2021
missing privilege so the users are identical.
22+
* MySQL Server 8.0 updated to 8.0.3-rc
23+
* MySQL Shell for 5.7 updated to 1.0.10
2124

2225
Changes in 1.1.0 (2017-07-24)
2326
* Fixed broken MYSQL_ONETIME_PASSWORD support (#86523)
@@ -45,5 +48,3 @@ Known issues:
4548
healthcheck script will generate an "Access denied for healthchecker@localhost"
4649
message in the server log every time it runs. If connection throttling is
4750
enabled this could eventually cause the healthcheck to fail
48-
* 5.7: Shell 1.0.9 is unable to set up innodb-cluster with the default
49-
root@localhost user (#86267)

0 commit comments

Comments
 (0)