Made it easier to rebuild the Docker image after someone else built it

Because we only pushed the final image to Docker Hub, it was impossible to
pull the base image someone else created and "quickly" build a new deploy
image.

Now the deploy scripts push (some) of the intermediate images as well,
making it possible to pull them later. I've added `build-pull.sh` and
`full-pull.sh` to perform this pull and built up from the pulled images.

deploy/build-all.sh

@@ -1 +0,0 @@
-build-quick.sh

deploy/build-all.sh

@@ -0,0 +1,41 @@
+#!/bin/bash -e
+
+# macOS does not support readlink -f, so we use greadlink instead
+if [[ `uname` == 'Darwin' ]]; then
+    command -v greadlink 2>/dev/null 2>&1 || { echo >&2 "Install greadlink using brew."; exit 1; }
+    readlink='greadlink'
+else
+    readlink='readlink'
+fi
+ROOT="$(dirname "$(dirname "$($readlink -f "$0")")")"
+
+case "$(basename "$0")" in
+    build-pull.sh)
+        docker pull armadillica/pillar_py:3.6
+        docker pull armadillica/pillar_wheelbuilder:latest
+        pushd "$ROOT/docker/3_buildwheels"
+        ./build.sh
+        popd
+        ;&
+    build-quick.sh)
+        pushd "$ROOT/docker/4_run"
+        ./build.sh
+        ;;
+    build-all.sh)
+        pushd "$ROOT/docker"
+        ./full_rebuild.sh
+        ;;
+    *)
+        echo "Unknown script $0, aborting" >&2
+        exit 1
+esac
+
+popd
+echo
+echo "Press [ENTER] to push the new Docker images."
+read dummy
+docker push armadillica/pillar_py:3.6
+docker push armadillica/pillar_wheelbuilder:latest
+docker push armadillica/blender_cloud:latest
+echo
+echo "Build is done, ready to update the server."

deploy/build-pull.sh

@@ -0,0 +1 @@
+build-quick.sh

deploy/build-quick.sh

@@ -1,32 +0,0 @@
-#!/bin/bash -e
-
-# macOS does not support readlink -f, so we use greadlink instead
-if [[ `uname` == 'Darwin' ]]; then
-    command -v greadlink 2>/dev/null 2>&1 || { echo >&2 "Install greadlink using brew."; exit 1; }
-    readlink='greadlink'
-else
-    readlink='readlink'
-fi
-ROOT="$(dirname "$(dirname "$($readlink -f "$0")")")"
-
-case "$(basename "$0")" in
-    build-quick.sh)
-        pushd "$ROOT/docker/4_run"
-        ./build.sh
-        ;;
-    build-all.sh)
-        pushd "$ROOT/docker"
-        ./full_rebuild.sh
-        ;;
-    *)
-        echo "Unknown script $0, aborting" >&2
-        exit 1
-esac
-
-popd
-echo
-echo "Press [ENTER] to push the new Docker image."
-read dummy
-docker push armadillica/blender_cloud:latest
-echo
-echo "Build is done, ready to update the server."

deploy/build-quick.sh

@@ -0,0 +1 @@
+build-all.sh

deploy/full-all.sh

@@ -1 +1,9 @@
-./2docker.sh && ./build-all.sh && ./2server.sh cloud2
+#!/bin/bash
+
+set -e
+
+NAME="$(basename "$0")"
+
+./2docker.sh
+./${NAME/full-/build-}
+./2server.sh cloud2

deploy/full-pull.sh

@@ -0,0 +1 @@
+full-all.sh

deploy/full-quick.sh

@@ -1 +0,0 @@
-./2docker.sh && ./build-quick.sh && ./2server.sh cloud2

deploy/full-quick.sh

@@ -0,0 +1 @@
+full-all.sh

docker/3_buildwheels/build.sh

@@ -22,7 +22,7 @@ fi
 echo "Wheelhouse is $WHEELHOUSE"
 mkdir -p "$WHEELHOUSE"
 
-docker build -t pillar_wheelbuilder .
+docker build -t armadillica/pillar_wheelbuilder:latest .
 
 GID=$(id -g)
 docker run --rm -i \