Merge "Don't use -f flag with docker tag"