Fix build image#37

Trung-DV wants to merge 2 commits intomacintushar:mainmacintushar/draw:mainfrom

Trung-DV:update-base-imageTrung-DV/draw:update-base-imageCopy head branch name to clipboard