Combine consecutive RUNs in Dockerfile

Also run apt-get upgrade and apt-get clean.