Add apt-get upgrade to the container
Do minor RUN lines re-ordering