From 653bc1f9f119ec009064168fdbaa324276bbbbe6 Mon Sep 17 00:00:00 2001 From: Joe Eltgroth Date: Fri, 2 Sep 2022 16:04:05 -0500 Subject: [PATCH] PDY-1210 Add logic to build buildpacks from invokers local path Co-authored-by: Andrew Su Signed-off-by: Joe Eltgroth --- buildpacks/java/Makefile | 3 +++ buildpacks/python/Makefile | 4 ++++ buildpacks/rules.mk | 1 + 3 files changed, 8 insertions(+) diff --git a/buildpacks/java/Makefile b/buildpacks/java/Makefile index 5dd6f71a..6fc79f1b 100644 --- a/buildpacks/java/Makefile +++ b/buildpacks/java/Makefile @@ -157,6 +157,9 @@ buildpacks.java.tests.sources := \ # Targets ######### +buildpacks.java.images.local: buildpacks.java.invoker.url=file://$(abspath $(invokers.out_dir)/java/java-function-invoker-$(buildpacks.java.invoker.version).jar) +buildpacks.java.images.local: buildpacks.java.images.offline + buildpacks.java.images.offline: $(buildpacks.java.images.offline.out) $(buildpacks.java.images.offline.out).sha256 buildpacks.java.images.online: $(buildpacks.java.images.online.out) $(buildpacks.java.images.online.out).sha256 buildpacks.java.images: buildpacks.java.images.offline buildpacks.java.images.online diff --git a/buildpacks/python/Makefile b/buildpacks/python/Makefile index 5d6faa09..94e60c6a 100644 --- a/buildpacks/python/Makefile +++ b/buildpacks/python/Makefile @@ -168,6 +168,10 @@ buildpacks.python.tests.sources := \ # Targets ######### +buildpacks.python.images.local: buildpacks.python.invoker.url=file://$(abspath $(invokers.out_dir)/python/pyfunc-invoker-$(buildpacks.python.invoker.version).tar.gz) +buildpacks.python.images.local: buildpacks.python.invoker_deps.url=file://$(abspath $(invokers.out_dir)/python/pyfunc-invoker-deps-$(buildpacks.python.invoker.version).tar.gz) +buildpacks.python.images.local: buildpacks.python.images.offline + buildpacks.python.images.offline: $(buildpacks.python.images.offline.out) $(buildpacks.python.images.offline.out).sha256 buildpacks.python.images.online: $(buildpacks.python.images.online.out) $(buildpacks.python.images.online.out).sha256 buildpacks.python.images: buildpacks.python.images.offline buildpacks.python.images.online diff --git a/buildpacks/rules.mk b/buildpacks/rules.mk index 9e6e6d7c..0278c03a 100644 --- a/buildpacks/rules.mk +++ b/buildpacks/rules.mk @@ -1,3 +1,4 @@ buildpack.bucket = gs://cnr-functions-release/kn-fn buildpack.build_dir = $(build_dir)/buildpacks buildpack.out_dir = $(out_dir)/buildpacks +include $(ROOT_DIR)/invokers/rules.mk \ No newline at end of file