Use ccenv docker image rather than baseimage

We want baseimage to only be used as a mechanism to assist
the build, not referenced at runtime.  Therefore, we
convert most instances of "baseimage" to use "ccenv"
(chaincode environment) since this is what they really want
anyway.

Note 1: A few instances (such as the UTXO example) did not have
an obvious solution so I left those to be sorted out by
the respective subsystem owners.

Note 2: The GOLANG chaincode type is currently a little suboptimal
in that the fabric-ccenv image loads the full fabric.git src
at build time and then the runtime re-injects it.  In the future
the build will only inject the golang shim and the runtime will
only inject the chaincode.  For now, this is somewhat inefficient
but ultimately still results in correct behavior.

Change-Id: I7f025bfff147fcca0f29f1656c7f63adc7a17173
Signed-off-by: Greg Haskins <[email protected]>

Author: ghaskins

core/chaincode/chaincodetest.yaml

@@ -354,17 +354,16 @@ chaincode:
         # This is the basis for the Golang Dockerfile.  Additional commands will
         # be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            from hyperledger/fabric-baseimage
-            #from utxo:0.1.0
-            COPY src $GOPATH/src
-            WORKDIR $GOPATH
+          FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
+          COPY src $GOPATH/src
+          WORKDIR $GOPATH
 
     car:
 
         # This is the basis for the CAR Dockerfile.  Additional commands will
         # be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            FROM hyperledger/fabric-baseimage
+          FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
 
     # timeout in millisecs for starting up a container and waiting for Register
     # to come through. 1sec should be plenty for chaincode unit tests

core/ledger/genesis/genesis_test.yaml

@@ -178,9 +178,9 @@ chaincode:
 
         # This is the basis for the Golang Dockerfile.  Additional commands will be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            from hyperledger/fabric-baseimage
-            COPY src $GOPATH/src
-            WORKDIR $GOPATH
+           FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
+           COPY src $GOPATH/src
+           WORKDIR $GOPATH
 
     #timeout for starting up a container and waiting for Register to come through
     startuptimeout: 20000

core/rest/rest_test.yaml

@@ -296,17 +296,16 @@ chaincode:
         # This is the basis for the Golang Dockerfile.  Additional commands will
         # be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            from hyperledger/fabric-baseimage
-            #from utxo:0.1.0
-            COPY src $GOPATH/src
-            WORKDIR $GOPATH
+          FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
+          COPY src $GOPATH/src
+          WORKDIR $GOPATH
 
     car:
 
         # This is the basis for the CAR Dockerfile.  Additional commands will
         # be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            FROM hyperledger/fabric-ccenv
+            FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
 
     # timeout in millisecs for starting up a container and waiting for Register
     # to come through. 1sec should be plenty for chaincode unit tests

examples/chaincode/go/utxo/Dockerfile

@@ -1,4 +1,5 @@
-from hyperledger/fabric-baseimage
+# FIXME: someone from the UTXO team will need to verify or rework this
+FROM ubuntu:latest
 
 RUN apt-get update && apt-get install pkg-config autoconf libtool -y
 RUN cd /tmp && git clone https://github.com/bitcoin/secp256k1.git && cd secp256k1/

membersrvc/Dockerfile

@@ -240,9 +240,9 @@ chaincode:
 
         # This is the basis for the Golang Dockerfile.  Additional commands will be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            from hyperledger/fabric-baseimage
-            COPY src $GOPATH/src
-            WORKDIR $GOPATH
+          FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
+          COPY src $GOPATH/src
+          WORKDIR $GOPATH
 
     #timeout in millisecs for starting up a container and waiting for Register to come through. 1sec should be plenty for chaincode unit tests
     startuptimeout: 1000

membersrvc/ca/ca_test.yaml

@@ -282,10 +282,9 @@ chaincode:
         # This is the basis for the Golang Dockerfile.  Additional commands will
         # be appended depedendent upon the chaincode specification.
         Dockerfile:  |
-            from hyperledger/fabric-baseimage
-            #from utxo:0.1.0
-            COPY src $GOPATH/src
-            WORKDIR $GOPATH
+          FROM hyperledger/fabric-ccenv:$(ARCH)-$(PROJECT_VERSION)
+          COPY src $GOPATH/src
+          WORKDIR $GOPATH
 
     car:
 
@@ -416,7 +415,7 @@ security:
       enabled: false
 
     # TCerts pool configuration.  Multi-thread pool can also be configured
-    # by multichannel option switching concurrency in communication with TCA. 
+    # by multichannel option switching concurrency in communication with TCA.
     multithreading:
       enabled: false
       multichannel: false