Merge remote-tracking branch 'origin/master' into accounts

scripts/portal-upgrade.sh

@@ -8,6 +8,9 @@ cwd=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
 # put the server down for maintenance
 . ${cwd}/portal-down.sh
 
+# build all container without cache
+docker-compose build --no-cache --parallel --pull --quiet
+
 # stop the docker services
 docker-compose down
 
@@ -20,9 +23,6 @@ docker system prune --force
 # important for webapp container, otherwise html files will not be updated)
 docker volume rm $(docker volume ls -q)
 
-# build all container without cache
-docker-compose build --no-cache --parallel --pull --quiet
-
 # start the docker services
 docker-compose up -d