From f0bb67cbc24a4ecd3439650d993dfd91bc95e6f0 Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sat, 12 Dec 2020 14:34:10 +0100
Subject: [PATCH] Ensure to pull latest base images during CI

---
 .github/workflows/build.yml   | 1 +
 .github/workflows/nightly.yml | 1 +
 Makefile                      | 4 ++--
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b07673d..89ef72e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -120,6 +120,7 @@ jobs:
             done;
             return 1;
           }
+          retry make _pull-base-image VERSION=${VERSION}
           retry make build-base VERSION=${VERSION}
         env:
           VERSION: ${{ matrix.version }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index fffa989..6fcf899 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -123,6 +123,7 @@ jobs:
             done;
             return 1;
           }
+          retry make _pull-base-image VERSION=${VERSION}
           retry make build-base VERSION=${VERSION}
         env:
           VERSION: ${{ matrix.version }}
diff --git a/Makefile b/Makefile
index 74f99c6..09b5372 100644
--- a/Makefile
+++ b/Makefile
@@ -202,7 +202,7 @@ build-work:
 #  REBUILD TARGETS
 # -------------------------------------------------------------------------------------------------
 
-rebuild-base: _pull-root-image
+rebuild-base: _pull-base-image
 rebuild-base: NO_CACHE=--no-cache
 rebuild-base: build-base
 
@@ -360,6 +360,6 @@ _check-image-exists:
 	fi;
 
 
-_pull-root-image:
+_pull-base-image:
 	@echo "Pulling root image for PHP ${VERSION}"
 	@docker pull $(shell grep FROM $(DIR)/base/Dockerfile-${VERSION} | sed 's/^FROM\s*//g';)