Make less use of RUN, less layers in Docker image