From 1704a5ab94c1f6bdfb952a89650b1e4c507a4630 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 10 Jun 2024 13:31:30 -0400
Subject: [PATCH] podman build does not support --squash and --layers at same
 time

Fixed: https://github.com/containers/podman/pull/22957

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 model_servers/llamacpp_python/Makefile | 4 ++--
 training/deepspeed/Makefile            | 3 +--
 training/instructlab/Makefile          | 6 +++---
 training/vllm/Makefile                 | 3 +--
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/model_servers/llamacpp_python/Makefile b/model_servers/llamacpp_python/Makefile
index 8dd3792e..c61a4164 100644
--- a/model_servers/llamacpp_python/Makefile
+++ b/model_servers/llamacpp_python/Makefile
@@ -17,11 +17,11 @@ all: build download-model-granite run
 
 .PHONY: build-cuda
 build-cuda:
-	"${CONTAINER_TOOL}"  build --squash --layers=false -t $(CUDA_IMAGE) . -f cuda/Containerfile
+	"${CONTAINER_TOOL}"  build --squash-all -t $(CUDA_IMAGE) . -f cuda/Containerfile
 
 .PHONY: build-vulkan
 build-vulkan:
-	"${CONTAINER_TOOL}"  build --squash --layers=false -t $(VULKAN_IMAGE) . -f vulkan/Containerfile
+	"${CONTAINER_TOOL}"  build --squash-all -t $(VULKAN_IMAGE) . -f vulkan/Containerfile
 
 .PHONY: download-model-granite # default model
 download-model-granite:
diff --git a/training/deepspeed/Makefile b/training/deepspeed/Makefile
index 5e9a8913..65d8c6ea 100644
--- a/training/deepspeed/Makefile
+++ b/training/deepspeed/Makefile
@@ -12,6 +12,5 @@ image:
 		$(ARCH:%=--platform linux/%) \
 		$(SOURCE_DATE_EPOCH:%=--timestamp=%) \
 		--file Containerfile \
-		--layers=false \
-		--squash \
+		--squash-all \
 		--tag oci:../build/deepspeed-trainer
diff --git a/training/instructlab/Makefile b/training/instructlab/Makefile
index 06295499..c2e8aa65 100644
--- a/training/instructlab/Makefile
+++ b/training/instructlab/Makefile
@@ -26,14 +26,14 @@ instructlab:
 .PHONY: nvidia
 nvidia: instructlab
 	rm -rf ../build/instructlab-$@
-	"${CONTAINER_TOOL}"  build --layers=false --squash -t oci:../build/instructlab-$@ instructlab/containers/cuda
+	"${CONTAINER_TOOL}"  build --squash-all -t oci:../build/instructlab-$@ instructlab/containers/cuda
 
 .PHONY: amd
 amd: instructlab
 	rm -rf ../build/instructlab-$@
-	"${CONTAINER_TOOL}"  build --layers=false --squash -t oci:../build/instructlab-$@ -f instructlab/containers/rocm/Containerfile instructlab
+	"${CONTAINER_TOOL}"  build --squash-all -t oci:../build/instructlab-$@ -f instructlab/containers/rocm/Containerfile instructlab
 
 .PHONY: intel
 intel: instructlab
 	rm -rf ../build/instructlab-$@
-	"${CONTAINER_TOOL}"  build --layers=false --squash -t oci:../build/instructlab-$@ -f instructlab/containers/hpu/Containerfile instructlab
+	"${CONTAINER_TOOL}"  build --squash-all -t oci:../build/instructlab-$@ -f instructlab/containers/hpu/Containerfile instructlab
diff --git a/training/vllm/Makefile b/training/vllm/Makefile
index 9755fc5d..fc65cf50 100644
--- a/training/vllm/Makefile
+++ b/training/vllm/Makefile
@@ -11,7 +11,6 @@ image:
 		$(ARCH:%=--platform linux/%) \
 		$(SOURCE_DATE_EPOCH:%=--timestamp=%) \
 		--file Containerfile \
-		--layers=false \
-		--squash \
+		--squash-all \
 		--tag oci:../build/vllm \
 		${CONTAINER_TOOL_EXTRA_ARGS} .