diff --git a/README.md b/README.md index e08d660..689e535 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,22 @@ Various toolchain bits and pieces shared between projects +# Quickstart +Create top-level Makefile +``` +REGISTRY := +IMAGE := +REGION := + +include .ci/podman.mk +``` + +Add subtree to your project: +``` +git subtree add --prefix .ci https://git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash +``` + + ## Jenkins Shared groovy libraries diff --git a/podman.mk b/podman.mk index 9435847..9336b4c 100644 --- a/podman.mk +++ b/podman.mk @@ -52,5 +52,10 @@ rm-test-image: @test -z "$$(docker image ls -q $(IMAGE):$(TAG)-test)" || docker image rm -f $(IMAGE):$(TAG)-test > /dev/null @test -z "$$(docker image ls -q $(IMAGE):$(TAG)-test)" || echo "Error: Removing test image failed" +# Convience task during dev of downstream projects +.PHONY: ci-pull-upstream +ci-pull-upstream: + git stash && git subtree pull --prefix .ci ssh://git@git.zero-downtime.net/ZeroDownTime/ci-tools-lib.git master --squash && git stash pop + .DEFAULT: @echo "$@ not implemented. NOOP"