Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove test repo from CI docker. #589

Merged
merged 2 commits into from
Mar 26, 2018
Merged

Remove test repo from CI docker. #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
221c4e5
Remove test repo from CI docker.
Mar 26, 2018
746c331
Enable 'PORTABLE' flag for rocksdb building procedure.
Mar 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-scripts/ubuntu-1604/build-3rd-parties.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ function build_rocksdb_deb {
git checkout $VERSION_TAG
sed -i 's/-m [email protected]/-m "Hyperledger <[email protected]>"/g' \
./build_tools/make_package.sh
EXTRA_CFLAGS="-fPIC" EXTRA_CXXFLAGS="-fPIC" ./build_tools/make_package.sh $VERSION
PORTABLE=1 EXTRA_CFLAGS="-fPIC" EXTRA_CXXFLAGS="-fPIC" ./build_tools/make_package.sh $VERSION
cp ./package/rocksdb_${VERSION}_amd64.deb $OUTPUT_PATH
# Install it in the system as it is needed by python-rocksdb.
make install
Expand Down
3 changes: 0 additions & 3 deletions ci/ubuntu.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,6 @@ ARG uid=1000
ARG user=indy
ARG venv=venv

RUN echo "deb https://repo.sovrin.org/test/deb xenial rocksdb" >> /etc/apt/sources.list && \
apt-get update

RUN apt-get update -y && apt-get install -y \
python3-nacl \
libindy-crypto=0.2.0 \
Expand Down