From 41b0142f69457598352711ef51b41c7420920f2f Mon Sep 17 00:00:00 2001 From: dbkbali Date: Fri, 3 Aug 2018 13:44:59 -0400 Subject: [PATCH] Update README.md shyft geth docker image size down to 1GB --- README.md | 2 +- .../docker/develop-alpine/shyftApi/Dockerfile | 2 - .../develop-alpine/shyftApi/wait-for.sh | 2 +- docker-compose.yml | 7 +- shyftBlockExplorerApi/vendor/vendor.json | 319 ------------------ wait-for.sh | 2 +- 6 files changed, 5 insertions(+), 329 deletions(-) diff --git a/README.md b/README.md index cd0a5dbe29..aaa54e6a48 100644 --- a/README.md +++ b/README.md @@ -329,7 +329,7 @@ govendor fetch github.com/ShyftNetwork/go-empyrean/crypto/secp256k1/^ -NB: The Shyft Geth docker image size is 5+ GB so make sure you have adequate space on your disk drive/ +NB: The Shyft Geth docker image size is 1+ GB so make sure you have adequate space on your disk drive/ _TODO_ diff --git a/containers/docker/develop-alpine/shyftApi/Dockerfile b/containers/docker/develop-alpine/shyftApi/Dockerfile index 36dd3a1d1a..f1bc0e3447 100644 --- a/containers/docker/develop-alpine/shyftApi/Dockerfile +++ b/containers/docker/develop-alpine/shyftApi/Dockerfile @@ -4,10 +4,8 @@ RUN apk add --update git make gcc musl-dev linux-headers ca-certificates COPY ./shyftBlockExplorerApi /go/src/github.com/ShyftNetwork/go-empyrean/shyftBlockExplorerApi COPY ./wait-for.sh / -RUN cat /go/src/github.com/ShyftNetwork/go-empyrean/shyftBlockExplorerApi/vendor/vendor.json WORKDIR /go/src/github.com/ShyftNetwork/go-empyrean/shyftBlockExplorerApi -RUN echo `pwd && ls -a` RUN go get -u github.com/kardianos/govendor RUN govendor sync RUN cat /go/src/github.com/ShyftNetwork/go-empyrean/shyftBlockExplorerApi/vendor/vendor.json diff --git a/containers/docker/develop-alpine/shyftApi/wait-for.sh b/containers/docker/develop-alpine/shyftApi/wait-for.sh index e8cd3cfaa6..9745286daf 100755 --- a/containers/docker/develop-alpine/shyftApi/wait-for.sh +++ b/containers/docker/develop-alpine/shyftApi/wait-for.sh @@ -32,7 +32,7 @@ wait_for() { trap 'kill $(jobs -p) &>/dev/null' EXIT START=$(date +%s) -timeout=20 +timeout=30 pids="" for i in $@ ; do case $i in diff --git a/docker-compose.yml b/docker-compose.yml index 062ce99386..de2b37a2e7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,6 +47,7 @@ services: ports: - "8080:8080" depends_on: + - shyftgeth - pg networks: - shyftnet @@ -68,12 +69,8 @@ services: - shyft_block_api networks: - shyftnet - # - shyftui - # command: sh -c 'bin/sh' networks: shyftnet: driver: bridge - # shyftui: - # external: true - + diff --git a/shyftBlockExplorerApi/vendor/vendor.json b/shyftBlockExplorerApi/vendor/vendor.json index de5a6dba3b..d29353990f 100644 --- a/shyftBlockExplorerApi/vendor/vendor.json +++ b/shyftBlockExplorerApi/vendor/vendor.json @@ -1,6 +1,5 @@ { "comment": "", -<<<<<<< HEAD "ignore": "test", "package": [ { @@ -8,86 +7,46 @@ "path": "github.com/ShyftNetwork/go-empyrean/common", "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "ignore": "", - "package": [ - { - "checksumSHA1": "4N5EW5g7AXUm43jBk2iC9dtTJNc=", - "path": "github.com/ShyftNetwork/go-empyrean/common", - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "0lTXpt67indxty1DyfsGUhZUxtc=", "path": "github.com/ShyftNetwork/go-empyrean/common/bitutil", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "Wzv00R7tDEPGN5lbROZLRork+38=", "path": "github.com/ShyftNetwork/go-empyrean/common/hexutil", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "aNgexBwEfI8ANaaMyQDyeHuFCUY=", "path": "github.com/ShyftNetwork/go-empyrean/common/math", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "zaAV9eypVRaotW+MMizuPxPJfHM=", "path": "github.com/ShyftNetwork/go-empyrean/common/mclock", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "FZSyCzy79paVzTFiw9hwQMmYqYM=", "path": "github.com/ShyftNetwork/go-empyrean/consensus", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "sT7DF05X1yBnMUcVgJhd4p+q7s0=", "path": "github.com/ShyftNetwork/go-empyrean/consensus/ethash", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "Fdv4KUKWQ+owyPIUlv8c2WLS6B4=", "path": "github.com/ShyftNetwork/go-empyrean/consensus/misc", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" }, @@ -96,105 +55,51 @@ "path": "github.com/ShyftNetwork/go-empyrean/core", "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" - }, - { - "checksumSHA1": "LVxr3PdJBC1b2kVTJFETkL5eCWQ=", - "path": "github.com/ShyftNetwork/go-empyrean/core", - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "vhNvzOqmXFBYdZtrpWhW8jhmGzY=", "path": "github.com/ShyftNetwork/go-empyrean/core/state", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "SRoGhYQpFaq3OQbf8g2WT2gAnwA=", "path": "github.com/ShyftNetwork/go-empyrean/core/types", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "dMRUmW+Wq2zvupYeXuYj0k3Vndc=", "path": "github.com/ShyftNetwork/go-empyrean/core/vm", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "MGgNhnPT/mJEIpdmWnTtewtzk0g=", "path": "github.com/ShyftNetwork/go-empyrean/crypto", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "3glJGNkz78GAuDWdW0Vn4AshJZ8=", "path": "github.com/ShyftNetwork/go-empyrean/crypto/bn256", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "YzKGOtVGw0wcMcQzyOcwx77TSsE=", "path": "github.com/ShyftNetwork/go-empyrean/crypto/bn256/cloudflare", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "VXAuy+4VsjnX8wiXEFcxPYwMu0c=", "path": "github.com/ShyftNetwork/go-empyrean/crypto/bn256/google", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" }, { "checksumSHA1": "VtCDPH1wjVu+6mjuEqY57mRsjwA=", -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" - }, - { - "checksumSHA1": "YA2hn7E0Yfaji13gPTUaN4iSTGE=", - "path": "github.com/ShyftNetwork/go-empyrean/crypto/randentropy", - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" - }, - { - "checksumSHA1": "L0qYCvdtwvpaMJ4WDoP2vqHxpG8=", ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 "path": "github.com/ShyftNetwork/go-empyrean/crypto/secp256k1", "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", "revisionTime": "2018-08-02T21:47:13Z" @@ -202,149 +107,81 @@ { "checksumSHA1": "QR0Uoq+x3/CiCbNWHXmsTIDrdF0=", "path": "github.com/ShyftNetwork/go-empyrean/crypto/sha3", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "DD9RzILcd1jH8JQS1wFnntJWb9Q=", "path": "github.com/ShyftNetwork/go-empyrean/ethdb", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "XnrX5RuMLgEGBXCUJCzAAYAyfMQ=", "path": "github.com/ShyftNetwork/go-empyrean/event", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "z1EsZ0xPHsbrmEP9f548xU5vRe0=", "path": "github.com/ShyftNetwork/go-empyrean/log", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "o1Jo5QZjpoQu/jlV8EdRReqx12I=", "path": "github.com/ShyftNetwork/go-empyrean/metrics", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "YHme1HzZG6QEuj+omsBga9q+Rng=", "path": "github.com/ShyftNetwork/go-empyrean/params", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "YaGPda/QZ2y7bTdRsIIlyI1zZlo=", "path": "github.com/ShyftNetwork/go-empyrean/rlp", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "8IM59NA2oUvUbqXJw+jYUcBIYWY=", "path": "github.com/ShyftNetwork/go-empyrean/rpc", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "X+6gj7lAoWmwGhd8kZCr/r13Ljw=", "path": "github.com/ShyftNetwork/go-empyrean/shyfttracerinterface", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "V0TAmfyHQS5bTiNTWBpPyWC26I4=", "path": "github.com/ShyftNetwork/go-empyrean/trie", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "USkefO0g1U9mr+8hagv3fpSkrxg=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/aristanetworks/goarista/monotime", "path": "github.com/aristanetworks/goarista/monotime", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "gZQ6HheWahvZzIc3phBnOwoWHjE=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/btcsuite/btcd/btcec", "path": "github.com/btcsuite/btcd/btcec", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" - }, - { - "checksumSHA1": "dvabztWVQX8f6oMLRyv4dLH+TGY=", - "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/davecgh/go-spew/spew", - "path": "github.com/davecgh/go-spew/spew", - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "zYnPsNAVm1/ViwCkN++dX2JQhBo=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/edsrzf/mmap-go", "path": "github.com/edsrzf/mmap-go", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" }, @@ -353,365 +190,209 @@ "path": "github.com/ethereum/go-ethereum/common/math", "revision": "35fcd2f42388d10c2c638dd3e2b4bd4306b07c19", "revisionTime": "2018-08-03T10:26:39Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "KZ3QD2QgUS4RcoKiA3mn5pSlJxQ=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/go-stack/stack", "path": "github.com/go-stack/stack", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "p/8vSviYF91gFflhrt5vkyksroo=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/golang/snappy", "path": "github.com/golang/snappy", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "g/V4qrXjUGG9B+e3hB+4NAYJ5Gs=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/gorilla/context", "path": "github.com/gorilla/context", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "XOY0t65siat4bLbC4VCmBA9dE7Y=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/gorilla/handlers", "path": "github.com/gorilla/handlers", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "YuYKzn2jczaM6DQcFDmukvAHUX4=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/gorilla/mux", "path": "github.com/gorilla/mux", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "d9PxF1XQGLMJZRct2R8qVM/eYlE=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/hashicorp/golang-lru", "path": "github.com/hashicorp/golang-lru", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "9hffs0bAIU6CquiRhKQdzjHnKt0=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/hashicorp/golang-lru/simplelru", "path": "github.com/hashicorp/golang-lru/simplelru", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "F7vsuKOVSMnFSi90odRxfhBEBeA=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/lib/pq", "path": "github.com/lib/pq", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "AU3fA8Sm33Vj9PBoRPSeYfxLRuE=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/lib/pq/oid", "path": "github.com/lib/pq/oid", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "LjPdvMphElL0GOVNQCsmZMVgWIw=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/rs/cors", "path": "github.com/rs/cors", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "hCRfPlNpqv8tvVivLzmXsoUOf1c=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/rs/xhandler", "path": "github.com/rs/xhandler", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "3QsnhPTXGytTbW3uDvQLgSo9s9M=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb", "path": "github.com/syndtr/goleveldb/leveldb", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "EKIow7XkgNdWvR/982ffIZxKG8Y=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/cache", "path": "github.com/syndtr/goleveldb/leveldb/cache", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "5KPgnvCPlR0ysDAqo6jApzRQ3tw=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/comparer", "path": "github.com/syndtr/goleveldb/leveldb/comparer", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "1DRAxdlWzS4U0xKN/yQ/fdNN7f0=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/errors", "path": "github.com/syndtr/goleveldb/leveldb/errors", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "eqKeD6DS7eNCtxVYZEHHRKkyZrw=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/filter", "path": "github.com/syndtr/goleveldb/leveldb/filter", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "weSsccMav4BCerDpSLzh3mMxAYo=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/iterator", "path": "github.com/syndtr/goleveldb/leveldb/iterator", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "gJY7bRpELtO0PJpZXgPQ2BYFJ88=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/journal", "path": "github.com/syndtr/goleveldb/leveldb/journal", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "MtYY1b2234y/MlS+djL8tXVAcQs=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/memdb", "path": "github.com/syndtr/goleveldb/leveldb/memdb", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "UmQeotV+m8/FduKEfLOhjdp18rs=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/opt", "path": "github.com/syndtr/goleveldb/leveldb/opt", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "QCSae2ub87f8awH+PKMpd8ZYOtg=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/storage", "path": "github.com/syndtr/goleveldb/leveldb/storage", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "gWFPMz8OQeul0t54RM66yMTX49g=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/table", "path": "github.com/syndtr/goleveldb/leveldb/table", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "V/Dh7NV0/fy/5jX1KaAjmGcNbzI=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/github.com/syndtr/goleveldb/leveldb/util", "path": "github.com/syndtr/goleveldb/leveldb/util", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "y/oIaxq2d3WPizRZfVjo8RCRYTU=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/golang.org/x/crypto/ripemd160", "path": "golang.org/x/crypto/ripemd160", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "Y+HGqEkYM15ir+J93MEaHdyFy0c=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/golang.org/x/net/context", "path": "golang.org/x/net/context", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "7EZyXN0EmZLgGxZxK01IJua4c8o=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/golang.org/x/net/websocket", "path": "golang.org/x/net/websocket", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" - }, - { - "checksumSHA1": "CEFTYXtWmgSh+3Ik1NmDaJcz4E0=", - "origin": "github.com/ShyftNetwork/go-empyrean/vendor/gopkg.in/check.v1", - "path": "gopkg.in/check.v1", - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "NGg7/qIJVUfXi7xnEyyDLocdi6Y=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/gopkg.in/fatih/set.v0", "path": "gopkg.in/fatih/set.v0", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "DQXNV0EivoHm4q+bkdahYXrjjfE=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/gopkg.in/karalabe/cookiejar.v2/collections/prque", "path": "gopkg.in/karalabe/cookiejar.v2/collections/prque", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 }, { "checksumSHA1": "0xgs8lwcWLUffemlj+SsgKlxvDU=", "origin": "github.com/ShyftNetwork/go-empyrean/vendor/gopkg.in/natefinch/npipe.v2", "path": "gopkg.in/natefinch/npipe.v2", -<<<<<<< HEAD "revision": "bc318b381ebd1042f4e282dd879a0463f9378786", "revisionTime": "2018-08-03T12:51:19Z" -======= - "revision": "81a40842f57bda0d10516e8a193ca2db45d67f2c", - "revisionTime": "2018-08-02T21:47:13Z" ->>>>>>> bc318b381ebd1042f4e282dd879a0463f9378786 } ], "rootPath": "github.com/ShyftNetwork/go-empyrean/shyftBlockExplorerApi" diff --git a/wait-for.sh b/wait-for.sh index e8cd3cfaa6..9745286daf 100755 --- a/wait-for.sh +++ b/wait-for.sh @@ -32,7 +32,7 @@ wait_for() { trap 'kill $(jobs -p) &>/dev/null' EXIT START=$(date +%s) -timeout=20 +timeout=30 pids="" for i in $@ ; do case $i in