Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

podman build does not support --squash and --layers at same time #545

Merged
merged 1 commit into from
Jun 11, 2024
Merged

podman build does not support --squash and --layers at same time #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions model_servers/llamacpp_python/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 1 addition & 2 deletions training/deepspeed/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@ image:
$(ARCH:%=--platform linux/%) \
$(SOURCE_DATE_EPOCH:%=--timestamp=%) \
--file Containerfile \
--layers=false \
--squash \
--squash-all \
--tag oci:../build/deepspeed-trainer
6 changes: 3 additions & 3 deletions training/instructlab/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 1 addition & 2 deletions training/vllm/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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} .