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

Minor updates

Browse source
This commit is contained in:
William Brown 2020-06-30 14:21:59 +10:00
parent 3f0d5f1909
commit ca0e73defd
4 changed files with 38 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CONTRIBUTORS.md
View file

@ -7,7 +7,7 @@
* Pando85 * Pando85
* Alberto Planas (aplanas) * Alberto Planas (aplanas)
* Jake (slipperyBishop) * Jake (slipperyBishop)
* Charcol * Charelle (Charcol)
* Leigh (excitedleigh) * Leigh (excitedleigh)
* Jamie (JJJollyjim) * Jamie (JJJollyjim)
* Triss Healy (NiryaAestus) * Triss Healy (NiryaAestus)

44
Makefile
View file

@ -1,7 +1,7 @@
.PHONY: help build/kanidmd build/radiusd test/kanidmd push/kanidmd push/radiusd vendor-prep doc install-tools prep .PHONY: help build/kanidmd build/radiusd test/kanidmd push/kanidmd push/radiusd vendor-prep doc install-tools prep
IMAGE_BASE ?= kanidm IMAGE_BASE ?= kanidm
IMAGE_VERSION ?= latest IMAGE_VERSION ?= alpha
.DEFAULT: help .DEFAULT: help
help: help:
@ -16,6 +16,30 @@ build/radiusd:
@docker build -f kanidm_rlm_python/Dockerfile -t $(IMAGE_BASE)/radius:$(IMAGE_VERSION) \ @docker build -f kanidm_rlm_python/Dockerfile -t $(IMAGE_BASE)/radius:$(IMAGE_VERSION) \
kanidm_rlm_python kanidm_rlm_python
build: build/kanidmd build/radiusd
tag/kanidmd:
@docker tag $(IMAGE_BASE)/server:$(IMAGE_VERSION) $(IMAGE_BASE)/server:latest
tag/radiusd:
@docker tag $(IMAGE_BASE)/radius:$(IMAGE_VERSION) $(IMAGE_BASE)/radius:latest
tag: tag/kanidmd tag/radiusd
push/kanidmd: ## push kanidmd images
push/kanidmd:
@docker push $(IMAGE_BASE)/server:$(IMAGE_VERSION)
push/radiusd: ## push radiusd image
push/radiusd:
@docker push $(IMAGE_BASE)/radius:$(IMAGE_VERSION)
push: build push/kanidmd push/radiusd
pushlatest: build tag push
@docker push $(IMAGE_BASE)/server:latest
@docker push $(IMAGE_BASE)/radius:latest
test/kanidmd: ## test kanidmd test/kanidmd: ## test kanidmd
test/kanidmd: test/kanidmd:
@docker build -f kanidmd/Dockerfile \ @docker build -f kanidmd/Dockerfile \
@ -26,14 +50,6 @@ test/kanidmd:
test/radiusd: build/radiusd ## test radiusd test/radiusd: build/radiusd ## test radiusd
push/kanidmd: ## push kanidmd images
push/kanidmd:
@docker push $(IMAGE_BASE)/server:$(IMAGE_VERSION)
push/radiusd: ## push radiusd image
push/radiusd:
@docker push $(IMAGE_BASE)/radius:$(IMAGE_VERSION)
vendor-prep: vendor-prep:
cargo vendor cargo vendor
tar -czf vendor.tar.gz vendor tar -czf vendor.tar.gz vendor
@ -54,3 +70,13 @@ update-version: ## update version form VERSION file in all Cargo.toml manifests
update-version: */Cargo.toml update-version: */Cargo.toml
@VERSION=`cat VERSION`; sed -i "0,/^version\ \= .*$$/{s//version = \"$$VERSION\"/}" */Cargo.toml @VERSION=`cat VERSION`; sed -i "0,/^version\ \= .*$$/{s//version = \"$$VERSION\"/}" */Cargo.toml
@echo updated to version "`cat VERSION`" cargo files @echo updated to version "`cat VERSION`" cargo files
publish:
cd kanidm_proto; cargo package
cd kanidm_proto; cargo publish
cd kanidmd; cargo package
cd kanidmd; cargo publish
cd kanidm_client; cargo package
cd kanidm_client; cargo publish
cd kanidm_tools; cargo package
cd kanidm_tools; cargo publish

2
RELEASE_NOTES.md
View file

@ -17,7 +17,7 @@ and help of many people. I would especially like to thank:
* Pando85 * Pando85
* Alberto Planas (aplanas) * Alberto Planas (aplanas)
* Jake (slipperyBishop) * Jake (slipperyBishop)
* Charcol * Charelle (Charcol)
* Leigh (excitedleigh) * Leigh (excitedleigh)
* Jamie (JJJollyjim) * Jamie (JJJollyjim)
* Triss Healy (NiryaAestus) * Triss Healy (NiryaAestus)

2
VERSION
View file

@ -1 +1 @@
1.0.0-rc10 1.1.0-alpha