Make get_option() handle duplicate options in my_print_defaults output #75
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
get_option() was added by #53 to extract `socket` and `pid-file` from my_print_defaults. However if a custom mysql configuration file has been added, my_print_defaults returns duplicates (it merely lists all options specified in any config file and doesn't de-dupe). In these cases, `ret` would equal `/var/run/mysqld/mysqld.sock /var/lib/mysql/mysql.sock`, causing: `/entrypoint.sh: line 9: [: /var/run/mysqld/mysqld.sock: binary operator expected` As such, get_option() should just return the last matching option found in the my_print_defaults output - which should correspond to the one in the custom configuration file (rather than say the global default). Fixes #74.
|
Travis is failing, however when I reverted my change for mysql:5.6, and pushed again, I got the same failure. In addition, the mysql:5.7 failure is a timeout during the build, which I can't see how is related to an entrypoint script change. As such, I believe the Travis runs are broken on master due to changes in https://github.com/docker-library/official-images or elsewhere. |
|
LGTM (and I'd personally be +1 for classifying this as a bug 👍) |
tianon
added a commit
that referenced
this pull request
Jun 30, 2015
Make get_option() handle duplicate options in my_print_defaults output
|
Thanks! Will file a bug again mysql's my_print_defaults when I get a chance :-) |
tianon
added a commit
to infosiftr/stackbrew
that referenced
this pull request
Jul 2, 2015
- `drupal`: 8.0.0-beta12 - `kibana`: 4.1.1 - `logstash`: 1.5.2 - `mongo`: 3.1.5 - `mysql`: fix `my_print_defaults` duplication (docker-library/mysql#75) - `percona`: 5.5.44-rel37.3-1.wheezy and 5.6.25-73.0-1.wheezy - `php`: switch from bz2 to xz (docker-library/php#110) - `pypy`: pip 7.1.0 - `python`: pip 7.1.0 - `rabbitmq`: simple support for alternate `default_vhost`, `default_user`, `default_pass` (docker-library/rabbitmq#28)
RichardScothern
pushed a commit
to RichardScothern/official-images
that referenced
this pull request
Jun 14, 2016
- `drupal`: 8.0.0-beta12 - `kibana`: 4.1.1 - `logstash`: 1.5.2 - `mongo`: 3.1.5 - `mysql`: fix `my_print_defaults` duplication (docker-library/mysql#75) - `percona`: 5.5.44-rel37.3-1.wheezy and 5.6.25-73.0-1.wheezy - `php`: switch from bz2 to xz (docker-library/php#110) - `pypy`: pip 7.1.0 - `python`: pip 7.1.0 - `rabbitmq`: simple support for alternate `default_vhost`, `default_user`, `default_pass` (docker-library/rabbitmq#28)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
get_option() was added by #53 to extract
socketandpid-filefrom my_print_defaults. However if a custom mysql configuration file has been added, my_print_defaults returns duplicates (it merely lists all options specified in any config file and doesn't de-dupe). In these cases,retwould equal:/var/run/mysqld/mysqld.sock /var/lib/mysql/mysqld.sock...causing:
/entrypoint.sh: line 9: [: /var/run/mysqld/mysqld.sock: binary operator expectedAs such, get_option() should just return the last matching option found in the my_print_defaults output - which should correspond to the one in the custom configuration file (rather than say the global default).
Fixes #74.