diff --git a/CMakeLists.txt b/CMakeLists.txt index 0733befb253..14d8798fdbf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -26,8 +26,8 @@ set( CMAKE_CXX_EXTENSIONS ON ) set( CXX_STANDARD_REQUIRED ON) set(VERSION_MAJOR 1) -set(VERSION_MINOR 1) -set(VERSION_PATCH 4) +set(VERSION_MINOR 2) +set(VERSION_PATCH 0) set( CLI_CLIENT_EXECUTABLE_NAME cleos ) set( NODE_EXECUTABLE_NAME nodeos ) diff --git a/Docker/README.md b/Docker/README.md index d5489a58584..db1e9d897fc 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -20,10 +20,10 @@ cd eos/Docker docker build . -t eosio/eos ``` -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 v1.1.4 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 v1.2.0 tag, you could do the following: ```bash -docker build -t eosio/eos:v1.1.4 --build-arg branch=v1.1.4 . +docker build -t eosio/eos:v1.2.0 --build-arg branch=v1.2.0 . ``` By default, the symbol in eosio.system is set to SYS. You can override this using the symbol argument while building the docker image.