SKALE-1850 build improvements

README.md

@@ -9,7 +9,7 @@
 ## Install Prerequisites
 
 ```
-sudo apt-get install build-essential make cmake gcc g++ python libprotobuf10 flex bison automake libtool texinfo libgnutls30
+sudo apt-get install build-essential make cmake gcc g++ python libprotobuf10 flex bison automake libtool texinfo libgcrypt20-dev libgnutls28-dev
 ```
 
 ## Clone this repository and its submodules

docker/Dockerfile

@@ -2,9 +2,11 @@ FROM ubuntu:bionic
 
 WORKDIR /usr/src/sdk
 
-RUN apt-get update && apt-get install -yq --no-install-recommends yaml vim telnet git ca-certificates build-essential ocaml ocamlbuild automake autoconf libtool wget python libssl-dev libssl-dev libcurl4-openssl-dev protobuf-compiler git libprotobuf-dev alien cmake debhelper uuid-dev libxml2-dev
-RUN apt install -y libprotobuf10 cmake flex bison  libprocps-dev ccache autoconf texinfo libssl-dev libboost-all-dev libjsonrpccpp-dev libjsonrpccpp-tools
-
+RUN apt update
+RUN apt install -y libprotobuf10 cmake flex bison ccache autoconf texinfo libgcrypt20-dev libgnutls28-dev
+RUN apt install -yq --no-install-recommends vim telnet git ca-certificates build-essential ocaml ocamlbuild automake autoconf libtool wget python python-setuptools python-pip protobuf-compiler git libprotobuf-dev alien cmake debhelper uuid-dev libxml2-dev
+### RUN apt install -yq yaml libprocps-dev libssl-dev libssl-dev libcurl4-openssl-dev libssl-dev libboost-all-dev libjsonrpccpp-dev libjsonrpccpp-tools
+RUN pip install pyyaml
 
 COPY install-psw.patch ./
 
@@ -18,16 +20,20 @@ RUN git clone -b sgx_2.5 --depth 1 https://github.com/intel/linux-sgx && \
     cd .. && rm -rf linux-sgx/
 
 
-
 # For debug purposes
 # COPY jhi.conf /etc/jhi/jhi.conf
 
-
-RUN git clone --recurse-submodules https://76b7983ebf14269178b99eff5b2be4b4b56fe7a5:@github.com/skalenetwork/sgxwallet.git
+### RUN git clone --recurse-submodules https://76b7983ebf14269178b99eff5b2be4b4b56fe7a5:@github.com/skalenetwork/sgxwallet.git
+RUN git clone --recurse-submodules https://github.com/skalenetwork/sgxwallet.git
 WORKDIR  sgxwallet
-RUN cd scripts; ./build.py 
-RUN autoreconf -vif 
-RUN automake
+RUN cd scripts; ./build.py
+### RUN autoreconf -vif
+### RUN automake
+RUN libtoolize --force
+RUN aclocal
+RUN autoheader
+RUN automake --force-missing --add-missing
+RUN autoconf
 RUN ./configure
-RUN cd libBLS; cmake -H. -Bbuild; cmake --build build -- -j$(nproc);
+### RUN cd libBLS; cmake -H. -Bbuild; cmake --build build -- -j$(nproc);
 RUN make

docker/build.sh

+#!/bin/bash
+sudo service docker start
+sudo docker build -t sgxcontainer .

jsonrpc/build.sh

@@ -90,7 +90,9 @@ make
 make install
 cd ..
 
-tar -xzf ./pre_downloaded/libjson-rpc-cpp.tar.gz
+#tar -xzf ./pre_downloaded/libjson-rpc-cpp.tar.gz
+git clone https://github.com/skalenetwork/libjson-rpc-cpp.git --recursive
+git checkout develop
 cd libjson-rpc-cpp
 rn -rf build || true
 mkdir -p build

scripts/install_packages.sh

 sudo dpkg -i *.deb
-sudo apt install cmake flex bison ccache autoconf texinfo libgnutls30
+sudo apt install cmake flex bison ccache autoconf texinfo libgcrypt20-dev libgnutls28-dev