SKALE-2502

ed8748ba · kladko · 5f7898a8 · ed8748ba
Unverified Commit ed8748ba authored Apr 27, 2020 by kladko
Show whitespace changes
Inline Side-by-side

Showing with 18 additions and 7 deletions

DockerfileBase DockerfileBase +18 -7

No files found.
--- a/DockerfileBase
+++ b/DockerfileBase
@@ -6,13 +6,22 @@ WORKDIR /usr/src/sdk

 COPY docker/install-psw.patch ./

-RUN apt update &&  apt install -yq apt-utils && apt 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    apt update && \
+       apt install -yq apt-utils && \
+       apt 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++ && git clone -b sgx_2.5 --depth 1 https://github.com/intel/linux-sgx && \
+       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 && \
@@ -25,4 +34,6 @@ RUN apt update &&  apt install -yq apt-utils && apt install -yq --no-install-rec
       cmake . -DCMAKE_BUILD_TYPE=Release -DINIT_SYSTEM=SysVinit && \
       make install && \
       cd .. && rm -rf dynamic-application-loader-host-interface-072d233296c15d0dcd1fb4570694d0244729f87b && \
-    ./autoconf.bash && ./configure && bash -c "make -j$(nproc)"
+       ./autoconf.bash &&
+       ./configure &&
+       bash -c "make -j$(nproc)"