Skip to content

Commit

Permalink
new build.sh option -f = overwrite hyperledger/iroha-docker images
Browse files Browse the repository at this point in the history
  • Loading branch information
satellitex authored and l4l committed Mar 17, 2017
1 parent 1e0a735 commit e5dcb38
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion core/service/izanami.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ namespace izanami {

//invoke when initialize Peer that to config Participation on the way
void startIzanami() {

logger::explore("izanami") << "startIzanami";
if( config::PeerServiceConfig::getInstance().isExistPublicKey( config::PeerServiceConfig::getInstance().getMyPublicKey() ) ) {
logger::explore("izanami") << "I am start up Iroha Peer.";
logger::explore("izanami") << "Closed Izanami";
Expand Down
6 changes: 6 additions & 0 deletions docker/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ if ! docker images hyperledger/iroha-dev | grep -q hyperledger/iroha-dev; then
fi
fi

# Overwrite docker image
if [ "$1" = "-f" ]; then
echo "yes read -f option overlap new iroha.tar"
./clear.sh
fi

# run dev container to build iroha
docker run -i \
-v ${IROHA_HOME}/docker/build:/build \
Expand Down
4 changes: 4 additions & 0 deletions docker/clear.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/bash
docker rm `docker ps -a -q -f status=exited`
docker rmi -f hyperledger/iroha-docker
rm -f $IROHA_HOEM/docker/build/iroha.tar
2 changes: 1 addition & 1 deletion docker/dev/scripts/build-iroha.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,6 @@ fi
(mkdir -p $IROHA_BUILD && \
cd $IROHA_BUILD && \
cmake $IROHA_HOME -DCMAKE_BUILD_TYPE=$build_type && \
make) || error "Can't build iroha"
make -j 14) || error "Can't build iroha"

mkdir -p $IROHA_BUILD/config

0 comments on commit e5dcb38

Please sign in to comment.