Browse Source

test/docker: install abci apps first

pull/426/head
Ethan Buchman 8 years ago
parent
commit
749df0536f
2 changed files with 9 additions and 4 deletions
  1. +1
    -1
      consensus/replay.go
  2. +8
    -3
      test/docker/Dockerfile

+ 1
- 1
consensus/replay.go View File

@ -253,7 +253,7 @@ func (h *Handshaker) ReplayBlocks(appHash []byte, appBlockHeight int, proxyApp p
return h.replayBlocks(proxyApp, appBlockHeight, storeBlockHeight, false)
} else if appBlockHeight == storeBlockHeight {
// we're good!
// We're good!
return appHash, h.checkAppHash(appHash)
}


+ 8
- 3
test/docker/Dockerfile View File

@ -6,10 +6,16 @@ RUN apt-get update && \
apt-get install -y --no-install-recommends \
jq bsdmainutils vim-common psmisc netcat
# Setup tendermint repo with vendored dependencies
# but without code - docker caching prevents reinstall on code change!
# Setup tendermint repo
ENV REPO $GOPATH/src/github.com/tendermint/tendermint
WORKDIR $REPO
# Install the apps
ADD scripts/install_abci_apps.sh install_abci_apps.sh
RUN bash install_abci_apps.sh
# Install the vendored dependencies before copying code
# docker caching prevents reinstall on code change!
ADD glide.yaml glide.yaml
ADD glide.lock glide.lock
ADD Makefile Makefile
@ -19,7 +25,6 @@ RUN make get_vendor_deps
COPY . $REPO
RUN go install ./cmd/tendermint
RUN bash scripts/install_abci_apps.sh
# expose the volume for debugging
VOLUME $REPO


Loading…
Cancel
Save