refactory Dockerfile #36