Commit 29433f0b authored by David Enyeart's avatar David Enyeart
Browse files

[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: default avatarDavid Enyeart <enyeart@us.ibm.com>
parent edabb1b0
......@@ -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
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment