Skip to content
Snippets Groups Projects
Commit e86794e5 authored by Ron Williams's avatar Ron Williams
Browse files

Update podman.mk

parent 2e42fbb6
Branches
Tags
No related merge requests found
############################################## ##############################################
# podman.mk - Use Podman to build components # # podman.mk - Use Podman to build components #
############################################## ##############################################
...@@ -9,7 +8,7 @@ IMAGE_TAG?=redox-base ...@@ -9,7 +8,7 @@ IMAGE_TAG?=redox-base
## Working Directory in Podman ## Working Directory in Podman
CONTAINER_WORKDIR?=/mnt/redox CONTAINER_WORKDIR?=/mnt/redox
## Podman Home Directory ## Podman Home Directory
PODMAN_HOME?=$(HOME)/.local/share/containers/storage/podman_home PODMAN_HOME?=build/podman
## Podman command with its many arguments ## Podman command with its many arguments
PODMAN_VOLUMES?=--volume "`pwd`":$(CONTAINER_WORKDIR):Z --volume $(PODMAN_HOME):/home:Z PODMAN_VOLUMES?=--volume "`pwd`":$(CONTAINER_WORKDIR):Z --volume $(PODMAN_HOME):/home:Z
PODMAN_ENV?=--env PATH=/home/poduser/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --env PODMAN_BUILD=0 PODMAN_ENV?=--env PATH=/home/poduser/.cargo/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin --env PODMAN_BUILD=0
...@@ -26,8 +25,8 @@ endif ...@@ -26,8 +25,8 @@ endif
container_clean: FORCE container_clean: FORCE
rm -f build/container.tag rm -f build/container.tag
@echo "If podman_home dir cannot be removed, " @echo "If podman dir cannot be removed, "
@echo "remove with either \"sudo rm\" or \"podman system reset\"." @echo "remove with \"sudo rm\"."
-rm -rf $(PODMAN_HOME) || true -rm -rf $(PODMAN_HOME) || true
@echo "For complete clean of images and containers, use \"podman system reset\"" @echo "For complete clean of images and containers, use \"podman system reset\""
-podman image rm --force $(IMAGE_TAG) || true -podman image rm --force $(IMAGE_TAG) || true
...@@ -46,7 +45,7 @@ build/container.tag: $(CONTAINERFILE) ...@@ -46,7 +45,7 @@ build/container.tag: $(CONTAINERFILE)
ifeq ($(PODMAN_BUILD),1) ifeq ($(PODMAN_BUILD),1)
rm -f build/container.tag rm -f build/container.tag
@echo "If podman_home dir cannot be removed, " @echo "If podman_home dir cannot be removed, "
@echo "remove with either \"sudo rm\" or \"podman system reset\"." @echo "remove with \"sudo rm\"."
-rm -rf $(PODMAN_HOME) || true -rm -rf $(PODMAN_HOME) || true
-podman image rm --force $(IMAGE_TAG) || true -podman image rm --force $(IMAGE_TAG) || true
mkdir -p $(PODMAN_HOME) mkdir -p $(PODMAN_HOME)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment