Commit 11eada6

committed

Replace source with automatic MYSQL_ROOT_PASSWORD fetching

1 parent 2328bc7 commit 11eada6Copy full SHA for 11eada6

File tree

-4

lines changed

-4

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,11 @@ dockerContainerId() {`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`dockerExec() {`
`61`		`- docker exec -i "$(docker-compose ps -q app)" $@`
	`61`	`+ docker exec -i "$(docker-compose ps -q app)" "$@"`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`dockerExecMySQL() {`
`65`		`- docker exec -i "$(docker-compose ps -q mysql)" $@`
	`65`	`+ docker exec -i "$(docker-compose ps -q mysql)" "$@"`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`dockerCopyFrom() {`

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`		`- source"$(cd"$( dirname "${BASH_SOURCE[0]}")"&&pwd)/../etc/environment.yml"`
	`29`	`+ MYSQL_ROOT_PASSWORD=$(dockerExecMySQL bash -c 'printf $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`		`- source"$(cd"$( dirname "${BASH_SOURCE[0]}")"&&pwd)/../etc/environment.yml"`
	`25`	`+ MYSQL_ROOT_PASSWORD=$(dockerExecMySQL bash -c 'printf $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)