From 7e11325de7b0b04f21e8d84fd07f16c8009d096d Mon Sep 17 00:00:00 2001 From: Thaipanda Date: Thu, 23 Apr 2020 17:33:29 +0800 Subject: [PATCH] prepare the v3.0.7 --- CMakeLists.txt | 2 +- Docker/README.md | 4 ++-- Docker/builder/Dockerfile | 7 ++++--- README.md | 4 ++-- README_CN.md | 4 ++-- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc5ba8ef030..c6b16e4958c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,7 @@ set( CXX_STANDARD_REQUIRED ON) set(VERSION_MAJOR 3) set(VERSION_MINOR 0) -set(VERSION_PATCH 6) +set(VERSION_PATCH 7) if(VERSION_SUFFIX) set(VERSION_FULL "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-${VERSION_SUFFIX}") diff --git a/Docker/README.md b/Docker/README.md index a193fc44a19..a775ee257ec 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -20,10 +20,10 @@ cd bos/Docker docker build . -t boscore/bos -s BOS ``` -The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v3.0.6 tag, you could do the following: +The above will build off the most recent commit to the master branch by default. If you would like to target a specific branch/tag, you may use a build argument. For example, if you wished to generate a docker image based off of the v3.0.7 tag, you could do the following: ```bash -docker build -t boscore/bos:v3.0.6 --build-arg branch=v3.0.6 . +docker build -t boscore/bos:v3.0.7 --build-arg branch=v3.0.7 . ``` diff --git a/Docker/builder/Dockerfile b/Docker/builder/Dockerfile index efe9290b851..daf160b7880 100644 --- a/Docker/builder/Dockerfile +++ b/Docker/builder/Dockerfile @@ -1,3 +1,4 @@ + FROM ubuntu:18.04 LABEL author="xiaobo " maintainer="Xiaobo Huang-Ming Huang Winlin " version="0.1.2" \ @@ -12,8 +13,8 @@ RUN echo "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main" >> /etc/ap && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - \ && apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -y git-core automake autoconf libtool build-essential pkg-config libtool \ - mpi-default-dev libicu-dev python-dev python3-dev libbz2-dev zlib1g-dev libssl-dev libgmp-dev \ - clang-7 lld-4.0 llvm-7-dev libclang-4.0-dev ninja-build libusb-1.0-0-dev curl libcurl4-gnutls-dev \ + mpi-default-dev libicu-dev python-dev python3-dev libbz2-dev zlib1g-dev libssl-dev libgmp-dev doxygen graphviz libgmp3-dev \ + clang-7 lld-4.0 llvm-7-dev libclang-4.0-dev ninja-build libusb-1.0-0-dev curl libcurl4-gnutls-dev autotools-dev ruby \ && rm -rf /var/lib/apt/lists/* RUN update-alternatives --install /usr/bin/clang clang /usr/lib/llvm-7/bin/clang 700 \ @@ -70,4 +71,4 @@ RUN git clone --depth 1 -b 0.2 https://github.com/boscore/cppkafka.git \ && mkdir build && cd build \ && cmake -DCPPKAFKA_RDKAFKA_STATIC_LIB=1 -DCPPKAFKA_BUILD_SHARED=0 .. \ && make install \ - && cd ../../ && rm -rf cppkafka + && cd ../../ && rm -rf cppkafka \ No newline at end of file diff --git a/README.md b/README.md index c576a181fa0..d669170b8b5 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # BOSCore - Blockchain financial center building a trusted business ecosystem. -## BOSCore Version: v3.0.6 -### Basic EOSIO Version: v1.6.6 (support REX, part 2.0.x) +## BOSCore Version: v3.0.7 +### Basic EOSIO Version: v1.6.6 (support REX & EOSVM, part 2.0.x) # Background The emergence of EOS has brought new imagination to the blockchain. In just a few months since the main network was launched, the version has undergone dozens of upgrades, not only the stability has been greatly improved, but also the new functions have been gradually realized. The node team is also actively involved in building the EOSIO ecosystem. What is even more exciting is that EOS has attracted more and more development teams. There are already hundreds of DApp running on the EOS main network. The transaction volume and circulation market value far exceed Ethereum, and the space for development is growing broader. diff --git a/README_CN.md b/README_CN.md index 6dcb8c63cfb..d5541436351 100644 --- a/README_CN.md +++ b/README_CN.md @@ -1,7 +1,7 @@ # BOSCore - 区块链自由港，构建可信商业生态。 -## BOSCore Version: v3.0.6 -### Basic EOSIO Version: v1.6.6 (support REX, part 2.0.x) +## BOSCore Version: v3.0.7 +### Basic EOSIO Version: v1.6.6 (support REX & EOSVM, part 2.0.x) # 背景 EOS的出现给区块链带来了新的想象力，主网启动短短几个月以来，版本经历了几十次升级，不仅稳定性得到了很大提高，并且新功能也逐步实现，各个节点团队也积极参与建设EOSIO生态。让人更加兴奋的是，EOS已经吸引了越来越多的开发团队，当前已经有数百个DApp在EOS主网上面运行，其交易量和流通市值远超以太坊，可发展的空间愈来愈广阔。