Add DOCKER_BUILD_OPTS and DOCKER_PUSH options to build script

Author: Toilal

build.sh

@@ -3,8 +3,14 @@
 # Run NAMESPACE=custom ./build.sh to customize images namespace
 NAMESPACE=${NAMESPACE-cdrx}
 
+# Run DOCKER_BUILD_OPTS=--pull ./build.sh to download latest version of base images.
+DOCKER_BUILD_OPTS=${DOCKER_BUILD_OPTS-}
+
+# Run DOCKER_PUSH=1 ./build.sh to push to registry
+DOCKER_PUSH=${DOCKER_PUSH-}
+
 echo "Building Default Linux image (Python 3, Precise, 64bit)"
-docker build -f Dockerfile-py3-precise-amd64 \
+docker build $DOCKER_BUILD_OPTS -f Dockerfile-py3-precise-amd64 \
 -t $NAMESPACE/pyinstaller-linux \
 -t $NAMESPACE/pyinstaller-linux:64bit \
 -t $NAMESPACE/pyinstaller-linux:python3 \
@@ -14,8 +20,18 @@ docker build -f Dockerfile-py3-precise-amd64 \
 -t $NAMESPACE/pyinstaller-linux:python3-precise-64bit \
 .
 
+if [ ! -z "$DOCKER_PUSH" ]; then
+  docker push $NAMESPACE/pyinstaller-linux
+  docker push $NAMESPACE/pyinstaller-linux:64bit
+  docker push $NAMESPACE/pyinstaller-linux:python3
+  docker push $NAMESPACE/pyinstaller-linux:precise
+  docker push $NAMESPACE/pyinstaller-linux:python3-64bit
+  docker push $NAMESPACE/pyinstaller-linux:python3-precise
+  docker push $NAMESPACE/pyinstaller-linux:python3-precise-64bit
+fi
+
 echo "Building Default Windows image (Python 3, Xenial, 64bit)"
-docker build -f Dockerfile-py3-xenial-win64 \
+docker build $DOCKER_BUILD_OPTS -f Dockerfile-py3-xenial-win64 \
 -t $NAMESPACE/pyinstaller-windows \
 -t $NAMESPACE/pyinstaller-windows:64bit \
 -t $NAMESPACE/pyinstaller-windows:xenial \
@@ -25,45 +41,92 @@ docker build -f Dockerfile-py3-xenial-win64 \
 -t $NAMESPACE/pyinstaller-windows:python3-xenial-64bit \
 .
 
+if [ ! -z "$DOCKER_PUSH" ]; then
+  docker push $NAMESPACE/pyinstaller-windows
+  docker push $NAMESPACE/pyinstaller-windows:64bit
+  docker push $NAMESPACE/pyinstaller-windows:xenial
+  docker push $NAMESPACE/pyinstaller-windows:python3
+  docker push $NAMESPACE/pyinstaller-windows:python3-64bit
+  docker push $NAMESPACE/pyinstaller-windows:python3-xenial
+  docker push $NAMESPACE/pyinstaller-windows:python3-xenial-64bit
+fi
+
 echo "Building Default Linux 32 bits image (Python 3, Precise, 32bit)"
-docker build -f Dockerfile-py3-precise-i386 \
+docker build $DOCKER_BUILD_OPTS -f Dockerfile-py3-precise-i386 \
 -t $NAMESPACE/pyinstaller-linux:32bit \
 -t $NAMESPACE/pyinstaller-linux:python3-32bit \
 -t $NAMESPACE/pyinstaller-linux:python3-precise-32bit \
 .
 
+if [ ! -z "$DOCKER_PUSH" ]; then
+  docker push $NAMESPACE/pyinstaller-linux:32bit
+  docker push $NAMESPACE/pyinstaller-linux:python3-32bit
+  docker push $NAMESPACE/pyinstaller-linux:python3-precise-32bit
+fi
+
 echo "Building Default Windows 32 bits image (Python 3, Xenial, 32bit)"
-docker build -f Dockerfile-py3-xenial-win32 \
+docker build $DOCKER_BUILD_OPTS -f Dockerfile-py3-xenial-win32 \
 -t $NAMESPACE/pyinstaller-windows:32bit \
 -t $NAMESPACE/pyinstaller-windows:python3-32bit \
 -t $NAMESPACE/pyinstaller-windows:python3-xenial-32bit \
 .
 
+if [ ! -z "$DOCKER_PUSH" ]; then
+  docker push $NAMESPACE/pyinstaller-windows:32bit
+  docker push $NAMESPACE/pyinstaller-windows:python3-32bit
+  docker push $NAMESPACE/pyinstaller-windows:python3-xenial-32bit
+fi
+
 echo "Building Default Windows Python 2 image (Python 2, Trusty, 32bit)"
-docker build -f Dockerfile-py2-trusty-win32 \
+docker build $DOCKER_BUILD_OPTS -f Dockerfile-py2-trusty-win32 \
 -t $NAMESPACE/pyinstaller-linux:python2 \
 -t $NAMESPACE/pyinstaller-linux:python2-trusty \
 -t $NAMESPACE/pyinstaller-linux:python2-32bit \
 -t $NAMESPACE/pyinstaller-linux:python2-trusty-32bit \
 .
 
+if [ ! -z "$DOCKER_PUSH" ]; then
+  docker push $NAMESPACE/pyinstaller-linux:python2
+  docker push $NAMESPACE/pyinstaller-linux:python2-trusty
+  docker push $NAMESPACE/pyinstaller-linux:python2-32bit
+  docker push $NAMESPACE/pyinstaller-linux:python2-trusty-32bit
+fi
+
 echo "Building Default Linux Python 2 image (Python 2, Precise, 64bit)"
-docker build -f Dockerfile-py2-precise-amd64 \
+docker build $DOCKER_BUILD_OPTS -f Dockerfile-py2-precise-amd64 \
 -t $NAMESPACE/pyinstaller-linux:python2 \
 -t $NAMESPACE/pyinstaller-linux:python2-precise \
 -t $NAMESPACE/pyinstaller-linux:python2-precise-64bit \
 .
 
+if [ ! -z "$DOCKER_PUSH" ]; then
+  docker push $NAMESPACE/pyinstaller-linux:python2
+  docker push $NAMESPACE/pyinstaller-linux:python2-precise
+  docker push $NAMESPACE/pyinstaller-linux:python2-precise-64bit
+fi
+
 echo "Building Default Linux Focal image (Python 3, Focal, 64bit)"
-docker build -f Dockerfile-py3-focal-amd64 \
+docker build $DOCKER_BUILD_OPTS -f Dockerfile-py3-focal-amd64 \
 -t $NAMESPACE/pyinstaller-linux:focal \
 -t $NAMESPACE/pyinstaller-linux:python3-focal \
 -t $NAMESPACE/pyinstaller-linux:python3-focal-64bit \
 .
 
+if [ ! -z "$DOCKER_PUSH" ]; then
+  docker push $NAMESPACE/pyinstaller-linux:focal \
+  docker push $NAMESPACE/pyinstaller-linux:python3-focal \
+  docker push $NAMESPACE/pyinstaller-linux:python3-focal-64bit \
+fi
+
 echo "Building Default Linux Xenial image (Python 3, Xenial, 64bit)"
-docker build -f Dockerfile-py3-xenial-amd64 \
+docker build $DOCKER_BUILD_OPTS -f Dockerfile-py3-xenial-amd64 \
 -t $NAMESPACE/pyinstaller-linux:xenial \
 -t $NAMESPACE/pyinstaller-linux:python3-xenial \
 -t $NAMESPACE/pyinstaller-linux:python3-xenial-64bit \
 .
+
+if [ ! -z "$DOCKER_PUSH" ]; then
+  docker push $NAMESPACE/pyinstaller-linux:xenial
+  docker push $NAMESPACE/pyinstaller-linux:python3-xenial
+  docker push $NAMESPACE/pyinstaller-linux:python3-xenial-64bit
+fi