From 29433f0b610b9515f2a5fe0d62ab323275eaaab7 Mon Sep 17 00:00:00 2001 From: David Enyeart Date: Fri, 29 Mar 2019 17:10:57 -0400 Subject: [PATCH] [FAB-14908] Support latest images for java/node cc Allow java chaincode javaenv and node chaincode baseimage to be at different version level than Fabric. Similar updates were made for v2.0 in FAB-11096. Change-Id: Ia7706a07aa77f781e5e3199c54194a82b9850820 Signed-off-by: David Enyeart --- core/chaincode/chaincodetest.yaml | 7 ++++++- sampleconfig/core.yaml | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/core/chaincode/chaincodetest.yaml b/core/chaincode/chaincodetest.yaml index b9be2937535..cc151dd34b3 100644 --- a/core/chaincode/chaincodetest.yaml +++ b/core/chaincode/chaincodetest.yaml @@ -315,7 +315,12 @@ chaincode: # tools added for java shim layer packaging. # This image is packed with shim layer libraries that are necessary # for Java chaincode runtime. - runtime: $(DOCKER_NS)/fabric-javaenv:$(ARCH)-$(PROJECT_VERSION) + runtime: $(DOCKER_NS)/fabric-javaenv:latest + + node: + # need node.js engine at runtime, currently available in baseimage + # but not in baseos + runtime: $(BASE_DOCKER_NS)/fabric-baseimage:latest # timeout in millisecs for starting up a container and waiting for Register # to come through. 1sec should be plenty for chaincode unit tests diff --git a/sampleconfig/core.yaml b/sampleconfig/core.yaml index 25ecd7b16e0..885a666c455 100644 --- a/sampleconfig/core.yaml +++ b/sampleconfig/core.yaml @@ -505,12 +505,12 @@ chaincode: # tools added for java shim layer packaging. # This image is packed with shim layer libraries that are necessary # for Java chaincode runtime. - runtime: $(DOCKER_NS)/fabric-javaenv:$(ARCH)-$(PROJECT_VERSION) + runtime: $(DOCKER_NS)/fabric-javaenv:latest node: # need node.js engine at runtime, currently available in baseimage # but not in baseos - runtime: $(BASE_DOCKER_NS)/fabric-baseimage:$(ARCH)-$(BASE_VERSION) + runtime: $(BASE_DOCKER_NS)/fabric-baseimage:latest # Timeout duration for starting up a container and waiting for Register # to come through. 1sec should be plenty for chaincode unit tests