Update dockerfile and makefile