Skip to content

Commit 7ac49da

Browse files
author
Piotr Obrzut
committed
BUG#30750730 Enable server 8.0 'Restart' command
Change-Id: Ia970ea2a942716f21c145a965c14753c995a0377
1 parent 2acac9d commit 7ac49da

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

gen_dockerfiles.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ INIT_STARTUP["5.6"]="\"\$@\" --skip-networking --socket=\"\$SOCKET\" \&"
5050
INIT_STARTUP["5.7"]="\"\$@\" --daemonize --skip-networking --socket=\"\$SOCKET\""
5151
INIT_STARTUP["8.0"]="\"\$@\" --daemonize --skip-networking --socket=\"\$SOCKET\""
5252

53+
declare -A STARTUP
54+
STARTUP["5.5"]="exec \"\$@\""
55+
STARTUP["5.6"]="exec \"\$@\""
56+
STARTUP["5.7"]="exec \"\$@\""
57+
STARTUP["8.0"]="env MYSQLD_PARENT_PID=\$\$ \"\$@\""
58+
5359
declare -A STARTUP_WAIT
5460
STARTUP_WAIT["5.5"]="\"yes\""
5561
STARTUP_WAIT["5.6"]="\"yes\""
@@ -122,6 +128,7 @@ do
122128
sed -i 's#%%EXPIRE_SUPPORT%%#'"${EXPIRE_SUPPORT[${VERSION}]}"'#g' tmpfile
123129
sed -i 's#%%SED_TZINFO%%#'"${TZINFO_WORKAROUND[${VERSION}]}"'#g' tmpfile
124130
sed -i 's#%%INIT_STARTUP%%#'"${INIT_STARTUP[${VERSION}]}"'#g' tmpfile
131+
sed -i 's#%%STARTUP%%#'"${STARTUP[${VERSION}]}"'#g' tmpfile
125132
sed -i 's#%%STARTUP_WAIT%%#'"${STARTUP_WAIT[${VERSION}]}"'#g' tmpfile
126133
sed -i 's#%%FULL_SERVER_VERSION%%#'"${FULL_SERVER_VERSIONS[${VERSION}]}"'#g' tmpfile
127134
sed -i 's#%%DEFAULT_LOG%%#'"${DEFAULT_LOG[${VERSION}]}"'#g' tmpfile

template/docker-entrypoint.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,5 @@ EOF
204204
echo "[Entrypoint] Starting MySQL %%FULL_SERVER_VERSION%%"
205205
fi
206206

207-
exec "$@"
207+
%%STARTUP%%
208208

0 commit comments

Comments
 (0)