Skip to content

Commit 6e15d4c

Browse files
committed
[FAB-1636] Remove references to RocksDB
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 <[email protected]>
1 parent 5eb299b commit 6e15d4c

File tree

3 files changed

+2
-17
lines changed

3 files changed

+2
-17
lines changed

.travis.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,9 @@ install:
2828
git clone https://github.com/hyperledger/fabric-baseimage.git
2929
cd $HOME/gopath/src/github.com/$USER_NAME/$REPO_NAME/fabric-baseimage/scripts/devenv && chmod +x setup.sh && sudo ./setup.sh
3030
rm -rf ../../../fabric-baseimage
31-
echo " Installing Rocks DB, g++ compilers & Dependencies "
31+
echo " Compilers & Dependencies "
3232
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
3333
sudo apt-get install build-essential -y
34-
sudo apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev
35-
cd /tmp
36-
git clone --branch v4.1 --single-branch --depth 1 https://github.com/facebook/rocksdb.git
37-
cd rocksdb
38-
make shared_lib
39-
sudo INSTALL_PATH=/usr/local make install-shared
4034
sudo ldconfig
4135
4236
before_script:

core/endorser/endorser_test.yaml

-9
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,6 @@ peer:
161161
# networkId: test
162162
networkId: dev
163163

164-
Dockerfile: |
165-
from hyperledger/fabric-baseimage:latest
166-
# Copy GOPATH src and install Peer
167-
COPY src $GOPATH/src
168-
RUN mkdir -p /var/hyperledger/db
169-
WORKDIR $GOPATH/src/github.com/hyperledger/fabric/peer/
170-
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
171-
172-
173164
# The Address this Peer will listen on
174165
listenAddress: 0.0.0.0:21212
175166
# The Address this Peer will bind to for providing services

devenv/setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ make clean gotools
132132
# Ensure permissions are set for GOPATH
133133
sudo chown -R ubuntu:ubuntu $GOPATH
134134

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

138138
# Configure vagrant specific environment

0 commit comments

Comments
 (0)