SKALE-2502

Dockerfile

@@ -31,7 +31,6 @@ RUN autoconf
 RUN ./configure
 ### RUN cd libBLS; cmake -H. -Bbuild; cmake --build build -- -j$(nproc);
 RUN make
-
 RUN mkdir /usr/src/sdk/sgx_data
 COPY docker/start.sh ./
 ENTRYPOINT ["/usr/src/sdk/start.sh"]

DockerfileBase

@@ -20,7 +20,6 @@ COPY intel-sgx-ssl ./intel-sgx-ssl
 COPY jsonrpc ./jsonrpc
 COPY leveldb ./leveldb
 COPY libBLS ./libBLS
-COPY m4 ./m4
 COPY scripts ./scripts
 COPY secure_enclave ./secure_enclave
 COPY sgx-gmp ./sgx-gmp
@@ -29,7 +28,7 @@ COPY trusted_libff ./trusted_libff
 RUN rm -rf /usr/src/sdk/leveldb/build/
 
 RUN apt-get update && apt-get install -yq --no-install-recommends python-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 yasm cmake flex bison  libprocps-dev ccache autoconf texinfo libssl-dev libboost-all-dev libjsonrpccpp-dev libjsonrpccpp-tools
+RUN apt install -y ccache vim libprotobuf10 yasm cmake flex bison  libprocps-dev ccache autoconf texinfo libssl-dev libboost-all-dev libjsonrpccpp-dev libjsonrpccpp-tools
 
 COPY docker/install-psw.patch ./
 
@@ -54,4 +53,11 @@ RUN wget --progress=dot:mega -O - https://github.com/intel/dynamic-application-l
     make install && \
     cd .. && rm -rf dynamic-application-loader-host-interface-072d233296c15d0dcd1fb4570694d0244729f87b
 
-
+RUN autoreconf -vif
+RUN libtoolize --force
+RUN aclocal
+RUN autoheader || true
+RUN automake --force-missing --add-missing
+RUN autoconf
+RUN ./configure
+RUN make

DockerfileSimulation

@@ -33,7 +33,6 @@ RUN ./configure --enable-sgx-simulation
 ### RUN cd libBLS; cmake -H. -Bbuild; cmake --build build -- -j$(nproc);
 RUN make
 
-
 RUN mkdir /usr/src/sdk/sgx_data
 
 COPY docker/start.sh ./

docker/start.sh

@@ -9,7 +9,7 @@ then
 echo "SGX wallet error. No /dev/random.";
 echo "If you are running raw docker without docker compose please make sure";
 echo "the command line includes -v /dev/urandom:/dev/random";
-exit(1);
+exit 1;
 fi
 
 ls /dev/random;

scripts/docker_test.py

@@ -31,7 +31,7 @@ import sys, os, subprocess, socket, time
 
 os.chdir("..")
 topDir = os.getcwd() + "/sgxwallet"
-print("Starting build push")
+print("Starting containerb test")
 print("Top directory is:" + topDir)
 SCRIPTS_DIR = topDir + "/scripts"
 
@@ -51,12 +51,13 @@ print("Running tests for branch " + BRANCH);
 
 assert subprocess.call(["docker", "image", "inspect", FULL_IMAGE_NAME]) == 0;
 
-completedProcess = subprocess.run(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data","-t",
+dockerRun = subprocess.run(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data","-t",
                         "--name", "sgxwallet", "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX, "-t"])
 
-print(completedProcess.stdout)
-print(completedProcess.stderr)
-assert completedProcess.returncode == 0;
+print(dockerRun.stdout)
+print(dockerRun.stderr)
+assert dockerRun.returncode == 0;
+
 
 
 assert subprocess.call(["docker", "rm", "sgxwallet"]) == 0

scripts/install_packages.sh

+#!/bin/bash
 sudo dpkg -i *.deb
-sudo apt install cmake flex bison yasm ccache autoconf texinfo libgcrypt20-dev libgnutls28-dev libtool pkg-config
+sudo apt install ccache cmake flex bison yasm ccache autoconf texinfo libgcrypt20-dev libgnutls28-dev libtool pkg-config