SKALE-2502

DockerfileBase

@@ -4,39 +4,25 @@ FROM ubuntu:bionic
 COPY . /usr/src/sdk
 WORKDIR /usr/src/sdk
 
+COPY docker/install-psw.patch ./
 
-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 ccache vim libprotobuf10 yasm cmake flex bison  libprocps-dev ccache autoconf texinfo libssl-dev libboost-all-dev libjsonrpccpp-dev libjsonrpccpp-tools
-
-RUN    ln -s /usr/bin/ccache /usr/local/bin/clang && \
+RUN apt-get update &&  apt-get-install -yq apt-utils && 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 ccache vim libprotobuf10 yasm cmake flex bison  libprocps-dev ccache autoconf texinfo libssl-dev libboost-all-dev libjsonrpccpp-dev libjsonrpccpp-tools && \
+       ln -s /usr/bin/ccache /usr/local/bin/clang && \
        ln -s /usr/bin/ccache /usr/local/bin/clang++ && \
        ln -s /usr/bin/ccache /usr/local/bin/gcc && \
        ln -s /usr/bin/ccache /usr/local/bin/g++ && \
        ln -s /usr/bin/ccache /usr/local/bin/cc && \
-       ln -s /usr/bin/ccache /usr/local/bin/c++
-
-COPY docker/install-psw.patch ./
-
-
-RUN git clone -b sgx_2.5 --depth 1 https://github.com/intel/linux-sgx && \
-    cd linux-sgx && \
-    patch -p1 -i ../install-psw.patch && \
-    ./download_prebuilt.sh 2> /dev/null && \
-    make -s -j$(nproc) sdk_install_pkg psw_install_pkg && \
-    ./linux/installer/bin/sgx_linux_x64_sdk_2.5.100.49891.bin --prefix=/opt/intel && \
-    ./linux/installer/bin/sgx_linux_x64_psw_2.5.100.49891.bin && \
-    cd .. && rm -rf linux-sgx/
-
-# For debug purposes
-# COPY docker/jhi.conf /etc/jhi/jhi.conf
-COPY configure.gmp ./
-RUN cd scripts; ./build.py
-
-RUN wget --progress=dot:mega -O - https://github.com/intel/dynamic-application-loader-host-interface/archive/072d233296c15d0dcd1fb4570694d0244729f87b.tar.gz | tar -xz && \
+       ln -s /usr/bin/ccache /usr/local/bin/c++ && git clone -b sgx_2.5 --depth 1 https://github.com/intel/linux-sgx && \
+       cd linux-sgx && \
+       patch -p1 -i ../install-psw.patch && \
+       ./download_prebuilt.sh 2> /dev/null && \
+       make -s -j$(nproc) sdk_install_pkg psw_install_pkg && \
+       ./linux/installer/bin/sgx_linux_x64_sdk_2.5.100.49891.bin --prefix=/opt/intel && \
+       ./linux/installer/bin/sgx_linux_x64_psw_2.5.100.49891.bin && \
+       cd .. && rm -rf linux-sgx/ && cd scripts && ./build.py && \
+       wget --progress=dot:mega -O - https://github.com/intel/dynamic-application-loader-host-interface/archive/072d233296c15d0dcd1fb4570694d0244729f87b.tar.gz | tar -xz && \
     cd dynamic-application-loader-host-interface-072d233296c15d0dcd1fb4570694d0244729f87b && \
     cmake . -DCMAKE_BUILD_TYPE=Release -DINIT_SYSTEM=SysVinit && \
     make install && \
-    cd .. && rm -rf dynamic-application-loader-host-interface-072d233296c15d0dcd1fb4570694d0244729f87b
-
-RUN ./autoconf.bash
-RUN ./configure
-RUN bash -c "make -j$(nproc)"
+    cd .. && rm -rf dynamic-application-loader-host-interface-072d233296c15d0dcd1fb4570694d0244729f87b && \
+    ./autoconf.bash && ./configure && bash -c "make -j$(nproc)"

scripts/docker_test.py

@@ -49,10 +49,8 @@ FULL_IMAGE_NAME = "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX;
 
 print("Running tests for branch " + BRANCH);
 
-assert subprocess.call(["docker", "image", "inspect", FULL_IMAGE_NAME]) == 0;
-
 dockerRun = subprocess.run(["docker", "run", "-v", topDir + "/sgx_data:/usr/src/sdk/sgx_data","-t",
-                            "-v", "/dev/urandom:/dev/random", "--name", "sgxwallet", "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX, "-t"])
+                            "--device", "/dev/urandom:/dev/random", "--name", "sgxwallet", "--network=host", "skalenetwork/" + IMAGE_NAME +":" + TAG_POSTFIX, "-t"])
 
 print(dockerRun.stdout)
 print(dockerRun.stderr)