Anton Kaliaev 7 years ago
parent
commit
7f4498f8b1
No known key found for this signature in database GPG Key ID: 7B6881D965918214
3 changed files with 3 additions and 30 deletions
  1. +0
    -14
      scripts/dep_utils/parse.sh
  2. +0
    -12
      scripts/install_abci_apps.sh
  3. +3
    -4
      test/docker/Dockerfile

+ 0
- 14
scripts/dep_utils/parse.sh View File

@ -1,14 +0,0 @@
#! /bin/bash
set +u
if [[ "$DEP" == "" ]]; then
DEP=$GOPATH/src/github.com/tendermint/tendermint/Gopkg.lock
fi
set -u
set -euo pipefail
LIB=$1
grep -A100 "$LIB" "$DEP" | grep revision | head -n1 | grep -o '"[^"]\+"' | cut -d '"' -f 2

+ 0
- 12
scripts/install_abci_apps.sh View File

@ -1,12 +0,0 @@
#! /bin/bash
# get the abci commit used by tendermint
COMMIT=$(bash scripts/dep_utils/parse.sh abci)
echo "Checking out vendored commit for abci: $COMMIT"
go get -d github.com/tendermint/tendermint/abci
cd "$GOPATH/src/github.com/tendermint/tendermint/abci" || exit
git checkout "$COMMIT"
make get_tools
make get_vendor_deps
make install

+ 3
- 4
test/docker/Dockerfile View File

@ -21,14 +21,13 @@ ADD Makefile Makefile
RUN make get_tools
RUN make get_vendor_deps
# Install the apps
ADD scripts scripts
RUN bash scripts/install_abci_apps.sh
# Now copy in the code
# NOTE: this will overwrite whatever is in vendor/
COPY . $REPO
# install ABCI CLI
RUN cd abci && make install && cd -
RUN go install ./cmd/tendermint
# expose the volume for debugging


Loading…
Cancel
Save