Skip to content
This repository was archived by the owner on Jan 30, 2020. It is now read-only.

Catch errors when scraping datadir from help output #27

Merged
merged 1 commit into from
Oct 13, 2016

Conversation

yosifkit
Copy link
Member

Before this change, a user would just get the container exiting and zero output. Now a user will get some friendly output about the command that was run and then the error messages that mysqld emitted.

See also docker-library/mysql#218

@tianon
Copy link
Member

tianon commented Oct 11, 2016

Are you planning to update this with the changes from docker-library/mysql#218, or would you rather be responsible for maintaining the delta? 😄 😉

@yosifkit
Copy link
Member Author

I'll be syncing all the changes tomorrow, so don't merge this or MariaDB/mariadb-docker#84.

@yosifkit
Copy link
Member Author

Changes have been re-synced to this and MariaDB/mariadb-docker#84 which also gets us the shopt -s nullglob from docker-library/mysql#200.

@@ -43,7 +61,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then
mkdir -p "$DATADIR"

echo 'Initializing database'
mysql_install_db --datadir="$DATADIR" --rpm
mysql_install_db --datadir="$DATADIR" --rpm --keep-my-cnf
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😉

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

- also, sync `nullglob` from mysql entrypoint
@tianon tianon merged commit 3085185 into docker-library:master Oct 13, 2016
@tianon tianon deleted the fix-datadir-scrape branch October 13, 2016 23:41
tianon added a commit to infosiftr/stackbrew that referenced this pull request Oct 14, 2016
- `mariadb`: sync entrypoint changes (MariaDB/mariadb-docker#84)
- `mysql`: add 8.0.0 DMR (docker-library/mysql#220)
- `opensuse`: update Tumbleweed
- `percona`: sync entrypoint changes (docker-library/percona#27)
- `php`: 7.0.12
- `ruby`: bundler 1.13.4
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants