Dockerfile simplification

Less RUN steps means less images to cache.