diff --git a/.cruft.json b/.cruft.json index 290c319..2a221ff 100644 --- a/.cruft.json +++ b/.cruft.json @@ -1,6 +1,6 @@ { "template": "https://github.com/vshn/appcat-cookiecutter", - "commit": "5309ae05edb3c118e23e64e8ec0bed2b6768ac86", + "commit": "439e1605c36082fb329ad631d0f7b013f3944c4c", "checkout": null, "context": { "cookiecutter": { diff --git a/ci.mk b/ci.mk index 64aa1d1..2288ee6 100644 --- a/ci.mk +++ b/ci.mk @@ -33,7 +33,7 @@ docker-push-branchtag: docker-build-branchtag docker-push ## Push docker image w .PHONY: package-build package-build: docker-build rm -f package/*.xpkg - go run github.com/crossplane/crossplane/cmd/crank@v1.16.0 xpkg build -f package --verbose --embed-runtime-image=${IMG}-func -o package/package.xpkg + go run github.com/crossplane/crossplane/cmd/crank@v1.16.0 xpkg build -f package --verbose --embed-runtime-image=${IMG} -o package/package.xpkg .PHONY: package-push package-push: package-build @@ -44,7 +44,7 @@ package-build-branchtag: export IMG_TAG=$(shell git rev-parse --abbrev-ref HEAD package-build-branchtag: docker-build-branchtag package-build .PHONY: package-push-package-branchtag -package-push-package-branchtag: export IMG_TAG=$(shell git rev-parse --abbrev-ref HEAD | sed 's/\//_/g') +package-push-branchtag: export IMG_TAG=$(shell git rev-parse --abbrev-ref HEAD | sed 's/\//_/g') package-push-branchtag: package-build-branchtag package-push .PHONY: docker-build-local