Merge "Update mariaDB version in portal-db Dockerfile" into guilin