Skip to content

Commit

Permalink
[FAB-1636] Remove references to RocksDB
Browse files Browse the repository at this point in the history
We no longer remove RocksDB and most references
have already been removed.  This hopefully
completes the task

Change-Id: I96089a9de8d206b5d31827165b58dee587e0bf9a
Signed-off-by: Gari Singh <gari.r.singh@gmail.com>
  • Loading branch information
mastersingh24 committed Apr 15, 2017
1 parent 5eb299b commit 6e15d4c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 17 deletions.
8 changes: 1 addition & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,9 @@ install:
git clone https://github.com/hyperledger/fabric-baseimage.git
cd $HOME/gopath/src/github.com/$USER_NAME/$REPO_NAME/fabric-baseimage/scripts/devenv && chmod +x setup.sh && sudo ./setup.sh
rm -rf ../../../fabric-baseimage
echo " Installing Rocks DB, g++ compilers & Dependencies "
echo " Compilers & Dependencies "
sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get -qq update && sudo apt-get -qq install g++-4.8 && sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
sudo apt-get install build-essential -y
sudo apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev
cd /tmp
git clone --branch v4.1 --single-branch --depth 1 https://github.com/facebook/rocksdb.git
cd rocksdb
make shared_lib
sudo INSTALL_PATH=/usr/local make install-shared
sudo ldconfig
before_script:
Expand Down
9 changes: 0 additions & 9 deletions core/endorser/endorser_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,15 +161,6 @@ peer:
# networkId: test
networkId: dev

Dockerfile: |
from hyperledger/fabric-baseimage:latest
# Copy GOPATH src and install Peer
COPY src $GOPATH/src
RUN mkdir -p /var/hyperledger/db
WORKDIR $GOPATH/src/github.com/hyperledger/fabric/peer/
RUN CGO_CFLAGS=" " CGO_LDFLAGS="-lrocksdb -lstdc++ -lm -lz -lbz2 -lsnappy" go install && cp $GOPATH/src/github.com/hyperledger/fabric/peer/core.yaml $GOPATH/bin
# The Address this Peer will listen on
listenAddress: 0.0.0.0:21212
# The Address this Peer will bind to for providing services
Expand Down
2 changes: 1 addition & 1 deletion devenv/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ make clean gotools
# Ensure permissions are set for GOPATH
sudo chown -R ubuntu:ubuntu $GOPATH

# Update limits.conf to increase nofiles for RocksDB
# Update limits.conf to increase nofiles for LevelDB and network connections
sudo cp /hyperledger/devenv/limits.conf /etc/security/limits.conf

# Configure vagrant specific environment
Expand Down

0 comments on commit 6e15d4c

Please sign in to comment.