changes for docker 0.6.5 & run/build scripts