Update to SGX SDK v2.4

Signed-off-by: Marcus Brandenburger <bur@zurich.ibm.com>

Author: mbrandenburger

README.md

@@ -97,7 +97,7 @@ deploying and running an example chaincode.
 * CMake 3.5.1 or higher
 * Go 1.11 or higher
 * Install Fabric v1.4 https://github.com/hyperledger/fabric 
-* Install the Linux SGX SDK v2.1.3 https://github.com/intel/linux-sgx 
+* Install the Linux SGX SDK v2.4 https://github.com/intel/linux-sgx 
 * You also need to install Intel SGX SSL https://github.com/intel/intel-sgx-ssl
 
 ### SGX SDK and SSL

utils/fabric-ccenv-sgx/Makefile

@@ -1,6 +1,10 @@
 .PHONY: all
 
-all: build
+all: prep build
+
+prep: 
+	git clone https://github.com/tozd/docker-sgx.git 
+	cd docker-sgx && ln -s ubuntu-xenial.dockerfile Dockerfile && git apply ../sgx_2.4.patch
 
 build:
 	docker build -t hyperledger/fabric-ccenv-sgx:latest docker-sgx

utils/fabric-ccenv-sgx/README.md

@@ -2,22 +2,8 @@
 
 Thanks tozd for providing this! https://github.com/tozd/docker-sgx
 
-First do this ...
-
-    $ git clone https://github.com/tozd/docker-sgx.git
-    $ cd docker-sgx
-    $ ln -s ubuntu-xenial.dockerfile Dockerfile
-
-Next edit ``ubuntu-xenial.dockerfile`` and change the first line (FROM) to the
-fabric chaincode environment image.
-
-    FROM hyperledger/fabric-ccenv:latest
-    
-Also add ``libsystemd-dev`` to the list of packages to install in line 6.
-
-Finally go back to ``fabric-ccenv-sgx`` root directory and just run `make`.
-
-Now you should see ``hyperledger/fabric-ccenv-sgx`` in the list of docker images.
+Run `make` and build the chaincode environment base image with SGX support. 
+You should now see ``hyperledger/fabric-ccenv-sgx`` in the list of docker images.
 
     $ docker images
 

utils/fabric-ccenv-sgx/sgx_2.4.patch

@@ -0,0 +1,25 @@
+diff --git a/ubuntu-xenial.dockerfile b/ubuntu-xenial.dockerfile
+index dca51eb..697d4cb 100644
+--- a/ubuntu-xenial.dockerfile
++++ b/ubuntu-xenial.dockerfile
+@@ -1,9 +1,9 @@
+-FROM tozd/runit:ubuntu-xenial
++FROM hyperledger/fabric-ccenv:latest
+ 
+ COPY ./patches /patches
+ 
+ RUN apt-get update -q -q && \
+- apt-get install wget python git patch build-essential ocaml automake autoconf libtool libssl-dev libcurl4-openssl-dev protobuf-compiler protobuf-c-compiler libprotobuf-dev libprotobuf-c0-dev alien uuid-dev libxml2-dev cmake pkg-config --yes --force-yes && \
++ apt-get install wget python git patch build-essential ocaml automake autoconf libtool libssl-dev libcurl4-openssl-dev protobuf-compiler protobuf-c-compiler libprotobuf-dev libprotobuf-c0-dev alien uuid-dev libxml2-dev cmake pkg-config libsystemd-dev --yes --force-yes && \
+  mkdir -p /tmp/icls && \
+  cd /tmp/icls && \
+  wget http://registrationcenter-download.intel.com/akdlm/irc_nas/11414/iclsClient-1.45.449.12-1.x86_64.rpm && \
+@@ -18,7 +18,7 @@ RUN apt-get update -q -q && \
+  make install && \
+  rm -rf /tmp/dynamic-application-loader-host-interface && \
+  cd /tmp && \
+- git clone https://github.com/01org/linux-sgx.git && \
++ git clone -b sgx_2.4 https://github.com/01org/linux-sgx.git && \
+  cd / && \
+  for patch in /patches/*; do patch --prefix=/patches/ -p0 --force "--input=$patch" || exit 1; done && \
+  rm -rf /patches && \