diff --git a/DOCKER/Dockerfile b/DOCKER/Dockerfile index 785d4480b80d2ce5c906ae29316091d8e859d02a..f9dd309cb91003bf7e0cfb7dacbc730cf24610bb 100644 --- a/DOCKER/Dockerfile +++ b/DOCKER/Dockerfile @@ -45,7 +45,7 @@ RUN git clone --quiet https://$REPO . && \ ENV REPO $GOPATH/src/github.com/eris-ltd/eris-db COPY . $REPO WORKDIR $REPO -RUN cd ./cmd/erisdb && go get -d && go build -o /usr/local/bin/erisdb && \ +RUN cd ./cmd/erisdb && go build -o /usr/local/bin/erisdb && \ cd ../erisdbss && go build -o /usr/local/bin/erisdbss && cd ../.. #----------------------------------------------------------------------------- diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index b0a272a0ee4107927c3cfd1deca0272417eb6885..c1ef66eabc1efc9157b2298a847859261f92e655 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -24,6 +24,10 @@ "Comment": "v1.0rc1-104-g1a7ab6e", "Rev": "1a7ab6e4d5fdc72d6df30ef562102ae6e0d18518" }, + { + "ImportPath": "github.com/google/go-snappy/snappy", + "Rev": "eaa750b9bf4dcb7cb20454be850613b66cda3273" + }, { "ImportPath": "github.com/gorilla/websocket", "Rev": "a3ec486e6a7a41858210b0fc5d7b5df593b3c4a3" @@ -77,10 +81,6 @@ "ImportPath": "github.com/syndtr/goleveldb/leveldb", "Rev": "a06509502ca32565bdf74afc1e573050023f261c" }, - { - "ImportPath": "github.com/syndtr/gosnappy/snappy", - "Rev": "156a073208e131d7d2e212cb749feae7c339e846" - }, { "ImportPath": "github.com/tendermint/ed25519", "Rev": "533fb6548e2071076888eda3c38749d707ba49bc" diff --git a/Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/decode.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/decode.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/decode.go rename to Godeps/_workspace/src/github.com/google/go-snappy/snappy/decode.go diff --git a/Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/encode.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/encode.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/encode.go rename to Godeps/_workspace/src/github.com/google/go-snappy/snappy/encode.go diff --git a/Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/snappy.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/snappy.go rename to Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy.go diff --git a/Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/snappy_test.go b/Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy_test.go similarity index 100% rename from Godeps/_workspace/src/github.com/syndtr/gosnappy/snappy/snappy_test.go rename to Godeps/_workspace/src/github.com/google/go-snappy/snappy/snappy_test.go diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go index f89e6bcd37ef751c508d83fbae3b42fc39a527ac..0ed58fb51be12eec4c780a98f1fa84510590b417 100644 --- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go +++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/reader.go @@ -14,7 +14,7 @@ import ( "strings" "sync" - "github.com/google/go-snappy/snappy" + "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/google/go-snappy/snappy" "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/cache" "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer" diff --git a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go index e064e78f533fc5619213f47dd5dfaee990b70e89..f656f42199b1916facf2016f28df7c0f12df9e13 100644 --- a/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go +++ b/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/table/writer.go @@ -12,7 +12,7 @@ import ( "fmt" "io" - "github.com/google/go-snappy/snappy" + "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/google/go-snappy/snappy" "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/comparer" "github.com/eris-ltd/eris-db/Godeps/_workspace/src/github.com/syndtr/goleveldb/leveldb/filter"