Merge pull request #34 from boscore/release/3.0.x

prepare 3.0.2

CMakeLists.txt

@@ -18,8 +18,8 @@ endif()
 
 set(VERSION_MAJOR 3)
 set(VERSION_MINOR 0)
-set(VERSION_PATCH 1)
-#set(VERSION_SUFFIX )
+set(VERSION_PATCH 2)
+#set(VERSION_SUFFIX)
 
 if (VERSION_SUFFIX)
    set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}")

README.md

@@ -1,6 +1,6 @@
 # BOSCore.CDT (Contract Development Toolkit)
 
-## BOSCore.CDT Version: v3.0.1
+## BOSCore.CDT Version: v3.0.2
 ## Basic EOSIO.CDT Version: 1.6.1
 
 ## Use BOSCore CDT docker image to build smart conrtacts 

docker/Dockerfile

@@ -2,17 +2,23 @@ FROM boscore/builder as builder
 ARG branch=master
 ARG bosbranch=master
 
+ENV EOSIO_ROOT=/opt/eosio
 ENV OPENSSL_ROOT_DIR /usr/include/openssl
+ENV PATH /opt/eosio/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV INSTALL_PREFIX=/usr/local/eosio
 
-RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install openssl ca-certificates curl wget git cmake python3 g++ vim net-tools lsof wget curl supervisor
+RUN mkdir -p "${INSTALL_PREFIX}"
 
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install openssl ca-certificates \
+            curl wget git cmake python3 g++ vim net-tools lsof wget curl supervisor libpthread-stubs0-dev
+
+RUN git clone -b $bosbranch https://github.com/boscore/bos.git --recursive \
+    && cd bos && echo "$bosbranch:$(git rev-parse HEAD)" > /etc/eosio-version \
+    && cmake -H. -B"${INSTALL_PREFIX}" -GNinja -DCMAKE_BUILD_TYPE=Release -DWASM_ROOT=/opt/wasm -DCMAKE_CXX_COMPILER=clang++ \
+       -DCMAKE_C_COMPILER=clang -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" -DBUILD_MONGO_DB_PLUGIN=true -DCORE_SYMBOL_NAME=$symbol \
+       -DOPENSSL_ROOT_DIR="${OPENSSL_ROOT_DIR}" -DCMAKE_CXX_STANDARD_LIBRARIES="-lpthread" \
+    && cmake --build "${INSTALL_PREFIX}" --target install
 
-RUN cd / && git clone --depth 1 -b $bosbranch https://github.com/boscore/bos.git --recursive \
-    && cd /bos \
-    && ./eosio_build.sh -s BOS \
-    && ./eosio_install.sh \
-    && cd .. \
-    && rm -rf ./bos
 
 RUN cd / && git clone -b $branch https://github.com/boscore/bos.cdt.git --recursive \
     && cd /bos.cdt/ \