Fix merge conflicts in Docker configurations#20

alokemajumder merged 2 commits intomainrendiffdev/ffmpeg-api:mainfrom

fix-merge-conflictsrendiffdev/ffmpeg-api:fix-merge-conflictsCopy head branch name to clipboard