Refactored GVM Dockerfile for reducing Docker layers