Right version of sgxsdk so that decryptor doesnt crash + own patches of graphene for verifier/apache

sgx-docker/Dockerfile

@@ -1,17 +1,15 @@
 FROM ubuntu:16.04
-RUN apt update && apt install -y build-essential sudo ocaml automake autoconf libtool wget python libssl-dev git protobuf-compiler libprotobuf-dev cmake curl libcurl4-openssl-dev lsb-release debhelper
+RUN apt update && apt install -y build-essential sudo ocaml automake autoconf libtool wget python libssl-dev git protobuf-compiler libprotobuf-dev cmake curl libcurl4-openssl-dev lsb-release debhelper unzip nano kmod
 WORKDIR /root
 RUN git clone https://github.com/intel/linux-sgx.git
 WORKDIR linux-sgx
-RUN git checkout sgx_2.6
-RUN ./download_prebuilt.sh
-RUN make #sdk USE_OPT_LIBS=0
-RUN make sdk_install_pkg
-RUN make deb_pkg
+RUN git checkout sgx_2.1
+RUN ./download_prebuilt.sh #Apparently need to run this even if we use opensource libraries - issue #363
+RUN make USE_OPT_LIBS=0 #For using opensource libraries for sgx library code.
+RUN make sdk_install_pkg 
+RUN make psw_install_pkg
 WORKDIR linux/installer/bin
 RUN echo -e "no\n/opt/intel" | ./sgx_linux_x64_sdk_*.bin
-WORKDIR ../deb
-RUN dpkg -i libsgx-enclave-common_*.deb libsgx-urts_*.deb
-RUN dpkg -i libsgx-enclave-common-dev_*.deb
+RUN echo -e "no\n/opt/intel" | ./sgx_linux_x64_psw_*.bin
 COPY start-aesmd /usr/local/sbin/
 WORKDIR /root

sgx-docker/start-aesmd

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-su -s /bin/bash aesmd -c "LD_LIBRARY_PATH=/opt/intel/libsgx-enclave-common/aesm /opt/intel/libsgx-enclave-common/aesm/aesm_service"
+su -s /bin/bash aesmd -c "LD_LIBRARY_PATH=/opt/intel/sgxpsw/aesm /opt/intel/sgxpsw/aesm/aesm_service"