From aa84090587d6259a1e3701fd35a10d6ac9005b73 Mon Sep 17 00:00:00 2001 From: Tan Jiang Date: Tue, 24 Oct 2017 12:46:23 +0800 Subject: [PATCH] Provide a template for git commit messages Also removed some comment in the entrypoint script. --- .gitmessage | 21 +++++++++++++++++++++ make/common/mariadb/docker-entrypoint.sh | 3 --- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 .gitmessage diff --git a/.gitmessage b/.gitmessage new file mode 100644 index 000000000..0d78bf5c7 --- /dev/null +++ b/.gitmessage @@ -0,0 +1,21 @@ +SUBJECT HERE +# +# Please provide your commit's subject above this line. +# +# Guideline (http://chris.beams.io/posts/git-commit/) +# +# 1. Separate subject from body with a blank line +# 2. Limit the subject line to 50 characters +# 3. Capitalize the first letter subject line +# 4. Do not end the subject line with a period +# 5. Use the imperative mood in the subject line +# 6. Wrap the body at 72 characters +# 7. Use the body to explain what and why vs. how +# +# Description of your commit should go below. Make sure to leave +# one empty line after your description. +# +# +BODY LINE1 +BODY LINE2 + diff --git a/make/common/mariadb/docker-entrypoint.sh b/make/common/mariadb/docker-entrypoint.sh index 7faebd6cf..8c9189cad 100644 --- a/make/common/mariadb/docker-entrypoint.sh +++ b/make/common/mariadb/docker-entrypoint.sh @@ -68,9 +68,7 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" -a "$(id -u)" = '0' ]; then DATADIR="$(_get_config 'datadir' "$@")" mkdir -p "$DATADIR" chown -R mysql:mysql "$DATADIR" - echo "####before gosu" exec sudo -u mysql -E "$BASH_SOURCE" "$@" - echo "####after gosu" fi if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then @@ -101,7 +99,6 @@ if [ "$1" = 'mysqld' -a -z "$wantHelp" ]; then pid="$!" mysql=( mysql --protocol=socket -uroot -hlocalhost --socket="${SOCKET}" ) - echo "#### mysql ${mysql}" for i in {30..0}; do if echo 'SELECT 1' | "${mysql[@]}" &> /dev/null; then