Merge pull request #545 from rhatdan/squash

podman build does not support --squash and --layers at same time
containers · Jun 11, 2024 · 5c92332 · 5c92332
2 parents f90a88c + 1704a5a
commit 5c92332
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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} .