mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 20:47:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Tweaks to make the makefile make things make easier.

Browse source
This commit is contained in:
James Hodgkinson 2024-06-27 16:24:39 +10:00
parent 6c8d065e83
commit 8ceeed39ed
1 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
Makefile
View file

@ -1,6 +1,6 @@
IMAGE_BASE ?= kanidm IMAGE_BASE ?= kanidm
IMAGE_VERSION ?= devel IMAGE_VERSION ?= devel
IMAGE_EXT_VERSION ?= 1.3.0-dev IMAGE_EXT_VERSION ?= $(shell cargo metadata --no-deps --format-version 1 | jq -r '.packages[] | select(.name == "daemon") | .version')
CONTAINER_TOOL_ARGS ?= CONTAINER_TOOL_ARGS ?=
IMAGE_ARCH ?= "linux/amd64,linux/arm64" IMAGE_ARCH ?= "linux/amd64,linux/arm64"
CONTAINER_BUILD_ARGS ?= CONTAINER_BUILD_ARGS ?=
@ -16,6 +16,23 @@ GIT_COMMIT := $(shell git rev-parse HEAD)
help: help:
@grep -E -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' @grep -E -h '\s##\s' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}'
.PHONY: config
config: ## Show makefile config things
config:
@echo "IMAGE_BASE: $(IMAGE_BASE)"
@echo "IMAGE_VERSION: $(IMAGE_VERSION)"
@echo "IMAGE_EXT_VERSION: $(IMAGE_EXT_VERSION)"
@echo "CONTAINER_TOOL_ARGS: $(CONTAINER_TOOL_ARGS)"
@echo "IMAGE_ARCH: $(IMAGE_ARCH)"
@echo "CONTAINER_BUILD_ARGS: $(CONTAINER_BUILD_ARGS)"
@echo "MARKDOWN_FORMAT_ARGS: $(MARKDOWN_FORMAT_ARGS)"
@echo "CONTAINER_TOOL: $(CONTAINER_TOOL)"
@echo "BUILDKIT_PROGRESS: $(BUILDKIT_PROGRESS)"
@echo "TESTS: $(TESTS)"
@echo "BOOK_VERSION: $(BOOK_VERSION)"
@echo "GIT_COMMIT: $(GIT_COMMIT)"
.PHONY: run .PHONY: run
run: ## Run the test/dev server run: ## Run the test/dev server
run: run:
@ -24,7 +41,6 @@ run:
.PHONY: buildx/kanidmd .PHONY: buildx/kanidmd
buildx/kanidmd: ## Build multiarch kanidm server images and push to docker hub buildx/kanidmd: ## Build multiarch kanidm server images and push to docker hub
buildx/kanidmd: buildx/kanidmd:
@echo $(IMAGE_EXT_VERSION)
@$(CONTAINER_TOOL) buildx build $(CONTAINER_TOOL_ARGS) \ @$(CONTAINER_TOOL) buildx build $(CONTAINER_TOOL_ARGS) \
--pull --push --platform $(IMAGE_ARCH) \ --pull --push --platform $(IMAGE_ARCH) \
-f server/Dockerfile \ -f server/Dockerfile \
@ -33,6 +49,7 @@ buildx/kanidmd:
--progress $(BUILDKIT_PROGRESS) \ --progress $(BUILDKIT_PROGRESS) \
--build-arg "KANIDM_BUILD_PROFILE=container_generic" \ --build-arg "KANIDM_BUILD_PROFILE=container_generic" \
--build-arg "KANIDM_FEATURES=" \ --build-arg "KANIDM_FEATURES=" \
--compress \
--label "com.kanidm.git-commit=$(GIT_COMMIT)" \ --label "com.kanidm.git-commit=$(GIT_COMMIT)" \
--label "com.kanidm.version=$(IMAGE_EXT_VERSION)" \ --label "com.kanidm.version=$(IMAGE_EXT_VERSION)" \
$(CONTAINER_BUILD_ARGS) . $(CONTAINER_BUILD_ARGS) .