[FAB-16714] Update Node.js chaincode build/start cmds

Instead of the "cp -R && npm install" hardcoded into the
peer, update the Node.js chaincode build command to a script
that is now included in the nodeenv image: /chaincode/build.sh

Instead of the "npm start" hardcoded into the peer, update
the Node.js chaincode start command to a script that is now
included in the nodeenv image: /chaincode/start.sh

This aligns Node.js chaincode with Java chaincode, and allows
the Node.js chaincode maintainers to manage the build/start
processing without having to submit CRs to core Fabric to
change the peer code.

Signed-off-by: Simon Stone <sstone1@uk.ibm.com>
Change-Id: I4d5c9a2623247ab182fdec07747775b6e6980025

Author: Simon Stone

core/chaincode/platforms/node/platform.go

@@ -174,9 +174,18 @@ func (p *Platform) GenerateDockerfile() (string, error) {
 	return dockerFileContents, nil
 }
 
+var buildScript = `
+set -e
+if [ -x /chaincode/build.sh ]; then
+	/chaincode/build.sh
+else
+	cp -R /chaincode/input/src/. /chaincode/output && cd /chaincode/output && npm install --production
+fi
+`
+
 func (p *Platform) DockerBuildOptions(path string) (util.DockerBuildOptions, error) {
 	return util.DockerBuildOptions{
 		Image: util.GetDockerImageFromConfig("chaincode.node.runtime"),
-		Cmd:   fmt.Sprint("cp -R /chaincode/input/src/. /chaincode/output && cd /chaincode/output && npm install --production"),
+		Cmd:   buildScript,
 	}, nil
 }

core/chaincode/platforms/node/platform_test.go

@@ -131,13 +131,22 @@ func TestGenerateDockerfile(t *testing.T) {
 	}
 }
 
+var expectedBuildScript = `
+set -e
+if [ -x /chaincode/build.sh ]; then
+	/chaincode/build.sh
+else
+	cp -R /chaincode/input/src/. /chaincode/output && cd /chaincode/output && npm install --production
+fi
+`
+
 func TestGenerateBuildOptions(t *testing.T) {
 	opts, err := platform.DockerBuildOptions("pathname")
 	assert.NoError(t, err)
 
 	expectedOpts := util.DockerBuildOptions{
 		Image: "hyperledger/fabric-nodeenv:latest",
-		Cmd:   "cp -R /chaincode/input/src/. /chaincode/output && cd /chaincode/output && npm install --production",
+		Cmd:   expectedBuildScript,
 	}
 	assert.Equal(t, expectedOpts, opts)
 }

core/container/dockercontroller/dockercontroller.go

@@ -206,6 +206,19 @@ func (vm *DockerVM) Build(ccid string, metadata *persistence.ChaincodePackageMet
 	}, nil
 }
 
+// In order to support starting chaincode containers built with Fabric v1.4 and earlier,
+// we must check for the precense of the start.sh script for Node.js chaincode before
+// attempting to call it.
+var nodeStartScript = `
+set -e
+if [ -x /chaincode/start.sh ]; then
+	/chaincode/start.sh --peer.address %[1]s
+else
+	cd /usr/local/src
+	npm start -- --peer.address %[1]s
+fi
+`
+
 func (vm *DockerVM) GetArgs(ccType string, peerAddress string) ([]string, error) {
 	// language specific arguments, possibly should be pushed back into platforms, but were simply
 	// ported from the container_runtime chaincode component
@@ -215,7 +228,7 @@ func (vm *DockerVM) GetArgs(ccType string, peerAddress string) ([]string, error)
 	case pb.ChaincodeSpec_JAVA.String():
 		return []string{"/root/chaincode-java/start", "--peerAddress", peerAddress}, nil
 	case pb.ChaincodeSpec_NODE.String():
-		return []string{"/bin/sh", "-c", fmt.Sprintf("cd /usr/local/src; npm start -- --peer.address %s", peerAddress)}, nil
+		return []string{"/bin/sh", "-c", fmt.Sprintf(nodeStartScript, peerAddress)}, nil
 	default:
 		return nil, errors.Errorf("unknown chaincodeType: %s", ccType)
 	}

core/container/dockercontroller/dockercontroller_test.go

@@ -63,7 +63,7 @@ func TestIntegrationPath(t *testing.T) {
 		DockerVM: &dc,
 	}, instance)
 
-	err = dc.Start(ccid, "NODE", &ccintf.PeerConnection{
+	err = dc.Start(ccid, "GOLANG", &ccintf.PeerConnection{
 		Address: "peer-address",
 	})
 	require.NoError(t, err)
@@ -72,6 +72,16 @@ func TestIntegrationPath(t *testing.T) {
 	require.NoError(t, err)
 }
 
+var expectedNodeStartScript = `
+set -e
+if [ -x /chaincode/start.sh ]; then
+	/chaincode/start.sh --peer.address peer-address
+else
+	cd /usr/local/src
+	npm start -- --peer.address peer-address
+fi
+`
+
 func TestGetArgs(t *testing.T) {
 	tests := []struct {
 		name         string
@@ -81,7 +91,7 @@ func TestGetArgs(t *testing.T) {
 	}{
 		{"golang-chaincode", pb.ChaincodeSpec_GOLANG, []string{"chaincode", "-peer.address=peer-address"}, ""},
 		{"java-chaincode", pb.ChaincodeSpec_JAVA, []string{"/root/chaincode-java/start", "--peerAddress", "peer-address"}, ""},
-		{"node-chaincode", pb.ChaincodeSpec_NODE, []string{"/bin/sh", "-c", "cd /usr/local/src; npm start -- --peer.address peer-address"}, ""},
+		{"node-chaincode", pb.ChaincodeSpec_NODE, []string{"/bin/sh", "-c", expectedNodeStartScript}, ""},
 		{"unknown-chaincode", pb.ChaincodeSpec_Type(999), []string{}, "unknown chaincodeType: 999"},
 	}
 	for _, tc := range tests {
@@ -491,6 +501,7 @@ type InMemBuilder struct{}
 func (imb InMemBuilder) Build() (io.Reader, error) {
 	buf := &bytes.Buffer{}
 	fmt.Fprintln(buf, "FROM busybox:latest")
+	fmt.Fprintln(buf, `RUN ln -s /bin/true /bin/chaincode`)
 	fmt.Fprintln(buf, `CMD ["tail", "-f", "/dev/null"]`)
 
 	startTime := time.Now()