Add modified Dockerfile and docker-entrypoint.sh