From 47806007317bb54b88cb0cff397f5baea4783dd8 Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Sun, 13 Nov 2022 22:16:55 +0000
Subject: [PATCH] Pull latest base image when building

---
 build-amd64.sh | 2 +-
 build-l4t.sh   | 2 +-
 build-rpi.sh   | 2 +-
 build-rpi64.sh | 2 +-
 push-images.sh | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/build-amd64.sh b/build-amd64.sh
index 3be7740..5ade8c0 100755
--- a/build-amd64.sh
+++ b/build-amd64.sh
@@ -17,7 +17,7 @@ if [ $PULL_EXIT_CODE -eq 0 ]; then
   echo Using pre-built Docker image - cgutman/moonlight-packaging:$TAG_NAME
 else
   echo Pre-built image not available - building cgutman/moonlight-packaging:$TAG_NAME
-  docker build -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
+  docker build --pull -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
   echo Built Docker image - cgutman/moonlight-packaging:$TAG_NAME
 fi
 
diff --git a/build-l4t.sh b/build-l4t.sh
index 74d1e74..5dbdedc 100755
--- a/build-l4t.sh
+++ b/build-l4t.sh
@@ -17,7 +17,7 @@ if [ $PULL_EXIT_CODE -eq 0 ]; then
   echo Using pre-built Docker image - cgutman/moonlight-packaging:$TAG_NAME
 else
   echo Pre-built image not available - building cgutman/moonlight-packaging:$TAG_NAME
-  docker build -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
+  docker build --pull -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
   echo Built Docker image - cgutman/moonlight-packaging:$TAG_NAME
 fi
 
diff --git a/build-rpi.sh b/build-rpi.sh
index 2c9affc..1ccac10 100755
--- a/build-rpi.sh
+++ b/build-rpi.sh
@@ -17,7 +17,7 @@ if [ $PULL_EXIT_CODE -eq 0 ]; then
   echo Using pre-built Docker image - cgutman/moonlight-packaging:$TAG_NAME
 else
   echo Pre-built image not available - building cgutman/moonlight-packaging:$TAG_NAME
-  docker build -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
+  docker build --pull -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
   echo Built Docker image - cgutman/moonlight-packaging:$TAG_NAME
 fi
 
diff --git a/build-rpi64.sh b/build-rpi64.sh
index 43cdf79..7d0992d 100755
--- a/build-rpi64.sh
+++ b/build-rpi64.sh
@@ -17,7 +17,7 @@ if [ $PULL_EXIT_CODE -eq 0 ]; then
   echo Using pre-built Docker image - cgutman/moonlight-packaging:$TAG_NAME
 else
   echo Pre-built image not available - building cgutman/moonlight-packaging:$TAG_NAME
-  docker build -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
+  docker build --pull -f $DOCKERFILE -t cgutman/moonlight-packaging:$TAG_NAME .
   echo Built Docker image - cgutman/moonlight-packaging:$TAG_NAME
 fi
 
diff --git a/push-images.sh b/push-images.sh
index 4431c04..957eb50 100755
--- a/push-images.sh
+++ b/push-images.sh
@@ -2,10 +2,10 @@ set -e
 
 TAG_UNIQUE_ID=`git ls-tree HEAD | sha256sum | cut -c-16`
 
-docker build -f Dockerfile.rpi.buster -t cgutman/moonlight-packaging:rpi-buster_$TAG_UNIQUE_ID .
-docker build -f Dockerfile.rpi.buster64 -t cgutman/moonlight-packaging:rpi-buster64_$TAG_UNIQUE_ID .
-docker build -f Dockerfile.amd64.buster -t cgutman/moonlight-packaging:amd64-buster_$TAG_UNIQUE_ID .
-docker build -f Dockerfile.l4t.bionic -t cgutman/moonlight-packaging:l4t-bionic_$TAG_UNIQUE_ID .
+docker build --pull -f Dockerfile.rpi.buster -t cgutman/moonlight-packaging:rpi-buster_$TAG_UNIQUE_ID .
+docker build --pull -f Dockerfile.rpi.buster64 -t cgutman/moonlight-packaging:rpi-buster64_$TAG_UNIQUE_ID .
+docker build --pull -f Dockerfile.amd64.buster -t cgutman/moonlight-packaging:amd64-buster_$TAG_UNIQUE_ID .
+docker build --pull -f Dockerfile.l4t.bionic -t cgutman/moonlight-packaging:l4t-bionic_$TAG_UNIQUE_ID .
 
 docker push cgutman/moonlight-packaging:rpi-buster_$TAG_UNIQUE_ID
 docker push cgutman/moonlight-packaging:rpi-buster64_$TAG_UNIQUE_ID