improve makefile to build base then runner images

Signed-off-by: Chanwit Kaewkasi <[email protected]>

Makefile

@@ -128,14 +128,16 @@ run-planner: manifests generate fmt vet ## Run a branch planner from your host.
 .PHONY: docker-build
 docker-build: ## Build docker
 	docker build -t ${MANAGER_IMG}:${TAG} ${BUILD_ARGS} .
-	docker build -t ${RUNNER_IMG}:${TAG} -f runner.Dockerfile ${BUILD_ARGS} .
+	docker build -t ${RUNNER_IMG}:${TAG}-base -f runner-base.Dockerfile ${BUILD_ARGS} .
+	docker build -t ${RUNNER_IMG}:${TAG} -f runner.Dockerfile --build-arg BASE_IMAGE=${RUNNER_IMG}:${TAG}-base ${BUILD_ARGS} .
 	docker build -t ${RUNNER_AZURE_IMAGE}:${TAG} -f runner-azure.Dockerfile ${BUILD_ARGS} .
 	docker build -t ${BRANCH_PLANNER_IMAGE}:${TAG} -f planner.Dockerfile ${BUILD_ARGS} .
 
 .PHONY: docker-buildx
 docker-buildx: ## Build docker
 	docker buildx build --load -t ${MANAGER_IMG}:${TAG} ${BUILD_ARGS} .
-	docker buildx build --load -t ${RUNNER_IMG}:${TAG} -f runner.Dockerfile ${BUILD_ARGS} .
+	docker buildx build --load -t ${RUNNER_IMG}:${TAG}-base -f runner-base.Dockerfile ${BUILD_ARGS} .
+	docker buildx build --load -t ${RUNNER_IMG}:${TAG} -f runner.Dockerfile --build-arg BASE_IMAGE=${RUNNER_IMG}:${TAG}-base ${BUILD_ARGS} .
 	docker buildx build --load -t ${RUNNER_AZURE_IMAGE}:${TAG} -f runner-azure.Dockerfile ${BUILD_ARGS} .
 	docker buildx build --load -t ${BRANCH_PLANNER_IMAGE}:${TAG} -f planner.Dockerfile ${BUILD_ARGS} .