Commit 2f72a2f

committed

Use printenf for fetching MYSQL_ROOT_PASSWD

1 parent 11eada6 commit 2f72a2fCopy full SHA for 2f72a2f

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ case "1ドル" in`
`26`	`26`	`fi`
`27`	`27`
`28`	`28`	`logMsg "Starting MySQL backup..."`
`29`		`- MYSQL_ROOT_PASSWORD=$(dockerExecMySQL bash -c 'printf $MYSQL_ROOT_PASSWORD')`
	`29`	`+ MYSQL_ROOT_PASSWORD=$(dockerExecMySQL printenv MYSQL_ROOT_PASSWORD)`
`30`	`30`	`dockerExecMySQL mysqldump -h mysql -u root -p"${MYSQL_ROOT_PASSWORD}" --opt --single-transaction --events --all-databases --routines --comments \| bzip2 > "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}"`
`31`	`31`	`logMsg "Finished"`
`32`	`32`	`else`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ case "1ドル" in`
`22`	`22`	`if [[ -n "$(dockerContainerId mysql)" ]]; then`
`23`	`23`	`if [ -f "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" ]; then`
`24`	`24`	`logMsg "Starting MySQL restore..."`
`25`		`- MYSQL_ROOT_PASSWORD=$(dockerExecMySQL bash -c 'printf $MYSQL_ROOT_PASSWORD')`
	`25`	`+ MYSQL_ROOT_PASSWORD=$(dockerExecMySQL printenv MYSQL_ROOT_PASSWORD)`
`26`	`26`	`bzcat "${BACKUP_DIR}/${BACKUP_MYSQL_FILE}" \| dockerExecMySQL mysql -h mysql -u root -p"${MYSQL_ROOT_PASSWORD}"`
`27`	`27`	`echo "FLUSH PRIVILEGES;" \| dockerExec mysql -h mysql -u root -p"${MYSQL_ROOT_PASSWORD}"`
`28`	`28`	`logMsg "Finished"`

Comments

(0)