joshuacox/katenary
1
0
Fork 0
forked from Katenary/katenary
Code Pull Requests Activity

docs: update warning message and formatting in containers.mk

Browse Source 
Co-authored-by: aider (ollama_chat/gpt-oss:120b) <aider@aider.chat>
This commit is contained in:
Josh Cox
2025-11-30 18:46:30 -06:00
parent 657b37eb0c
commit de1593a2a1
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/containers.mk
View File

@@ -1,11 +1,10 @@
# Get the container (Podman is preferred, but docker can be used too. It may failed with Docker.) # Get the container (Podman is preferred, but docker can be used too. It may failed with Docker.)
# TODO: propose nerdctl # TODO: propose nerdctl
CTN := $(shell which podman 2>&1 1>/dev/null && echo "podman" || echo "docker") CTN := $(shell which podman 2>&1 1>/dev/null && echo "podman" || echo "docker")
ifeq ($(CTN),podman) ifeq ($(CTN),podman)
CTN_USERMAP = --userns=keep-id CTN_USERMAP = --userns=keep-id
else else
$(MAKE) warn-docker $(warning Warning: Docker is not recommended, use Podman instead.)
CTN_USERMAP = --user=$(shell id -u):$(shell id -g) -e HOME=/tmp CTN_USERMAP = --user=$(shell id -u):$(shell id -g) -e HOME=/tmp
endif endif
@@ -44,6 +43,7 @@ packager-oci-image:
builder-oci-image: builder-oci-image:
@$(CTN) build -t go-builder:$(GOVERSION) ./oci/builder \ @$(CTN) build -t go-builder:$(GOVERSION) ./oci/builder \
--build-arg GOVERSION=$(GOVERSION) 1>/dev/null --build-arg GOVERSION=$(GOVERSION) 1>/dev/null
katenary-oci: katenary-oci:
VERSION=$(VERSION) \ VERSION=$(VERSION) \
VERSION=$${VERSION#releases/}; \ VERSION=$${VERSION#releases/}; \