Merge "added new docker-entrypoint.sh for mariadb"