From c57ab8724e021190fd37e37ac2c6ae29adf3e627 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Tue, 27 Feb 2018 17:31:54 +0400
Subject: [PATCH 1/2] fix Dockerfile.develop

---
 Dockerfile.develop | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.develop b/Dockerfile.develop
index 4af832bd5..c6ec05f69 100644
--- a/Dockerfile.develop
+++ b/Dockerfile.develop
@@ -6,7 +6,7 @@ WORKDIR /go/src/github.com/tendermint/abci
 COPY Makefile /go/src/github.com/tendermint/abci/
 
 # see make protoc for details on ldconfig
-RUN make install_protoc && ldconfig
+RUN make get_protoc && ldconfig
 
 # killall is used in tests
 RUN apt-get update && apt-get install -y \
@@ -15,7 +15,9 @@ RUN apt-get update && apt-get install -y \
 
 COPY Gopkg.toml /go/src/github.com/tendermint/abci/
 COPY Gopkg.lock /go/src/github.com/tendermint/abci/
-COPY . /go/src/github.com/tendermint/abci
+RUN make get_tools
 
-RUN make get_vendor_deps
+# see https://github.com/golang/dep/issues/1312
+RUN dep ensure -vendor-only
 
+COPY . /go/src/github.com/tendermint/abci

From 345a5a5a34aa31ad00626266f59e4ae7652ee274 Mon Sep 17 00:00:00 2001
From: Anton Kaliaev <anton.kalyaev@gmail.com>
Date: Tue, 27 Feb 2018 17:49:49 +0400
Subject: [PATCH 2/2] remove glide

---
 glide.lock | 120 -----------------------------------------------------
 glide.yaml |  28 -------------
 2 files changed, 148 deletions(-)
 delete mode 100644 glide.lock
 delete mode 100644 glide.yaml

diff --git a/glide.lock b/glide.lock
deleted file mode 100644
index e99f5e2e6..000000000
--- a/glide.lock
+++ /dev/null
@@ -1,120 +0,0 @@
-hash: cff2757779ef879f0c625c42af37fb3e486afd93ab9a91175c2458a719faac66
-updated: 2018-02-20T22:02:37.638875125-05:00
-imports:
-- name: github.com/go-kit/kit
-  version: 4dc7be5d2d12881735283bcab7352178e190fc71
-  subpackages:
-  - log
-  - log/level
-  - log/term
-- name: github.com/go-logfmt/logfmt
-  version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5
-- name: github.com/go-stack/stack
-  version: 259ab82a6cad3992b4e21ff5cac294ccb06474bc
-- name: github.com/gogo/protobuf
-  version: 1adfc126b41513cc696b209667c8656ea7aac67c
-  subpackages:
-  - gogoproto
-  - jsonpb
-  - proto
-  - protoc-gen-gogo/descriptor
-  - sortkeys
-  - types
-- name: github.com/golang/protobuf
-  version: 925541529c1fa6821df4e44ce2723319eb2be768
-  subpackages:
-  - proto
-  - ptypes
-  - ptypes/any
-  - ptypes/duration
-  - ptypes/timestamp
-- name: github.com/golang/snappy
-  version: 553a641470496b2327abcac10b36396bd98e45c9
-- name: github.com/inconshreveable/mousetrap
-  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-- name: github.com/jmhodges/levigo
-  version: c42d9e0ca023e2198120196f842701bb4c55d7b9
-- name: github.com/kr/logfmt
-  version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0
-- name: github.com/pkg/errors
-  version: 645ef00459ed84a119197bfb8d8205042c6df63d
-- name: github.com/spf13/cobra
-  version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b
-- name: github.com/spf13/pflag
-  version: 4c012f6dcd9546820e378d0bdda4d8fc772cdfea
-- name: github.com/syndtr/goleveldb
-  version: 211f780988068502fe874c44dae530528ebd840f
-  subpackages:
-  - leveldb
-  - leveldb/cache
-  - leveldb/comparer
-  - leveldb/errors
-  - leveldb/filter
-  - leveldb/iterator
-  - leveldb/journal
-  - leveldb/memdb
-  - leveldb/opt
-  - leveldb/storage
-  - leveldb/table
-  - leveldb/util
-- name: github.com/tendermint/tmlibs
-  version: 1b9b5652a199ab0be2e781393fb275b66377309d
-  subpackages:
-  - common
-  - db
-  - log
-  - process
-- name: golang.org/x/net
-  version: 2fb46b16b8dda405028c50f7c7f0f9dd1fa6bfb1
-  subpackages:
-  - context
-  - http2
-  - http2/hpack
-  - idna
-  - internal/timeseries
-  - lex/httplex
-  - trace
-- name: golang.org/x/text
-  version: e19ae1496984b1c655b8044a65c0300a3c878dd3
-  subpackages:
-  - secure/bidirule
-  - transform
-  - unicode/bidi
-  - unicode/norm
-- name: google.golang.org/genproto
-  version: 4eb30f4778eed4c258ba66527a0d4f9ec8a36c45
-  subpackages:
-  - googleapis/rpc/status
-- name: google.golang.org/grpc
-  version: 401e0e00e4bb830a10496d64cd95e068c5bf50de
-  subpackages:
-  - balancer
-  - codes
-  - connectivity
-  - credentials
-  - grpclb/grpc_lb_v1/messages
-  - grpclog
-  - internal
-  - keepalive
-  - metadata
-  - naming
-  - peer
-  - resolver
-  - stats
-  - status
-  - tap
-  - transport
-testImports:
-- name: github.com/davecgh/go-spew
-  version: 346938d642f2ec3594ed81d874461961cd0faa76
-  subpackages:
-  - spew
-- name: github.com/pmezard/go-difflib
-  version: 792786c7400a136282c1664665ae0a8db921c6c2
-  subpackages:
-  - difflib
-- name: github.com/stretchr/testify
-  version: 12b6f73e6084dad08a7c6e575284b177ecafbc71
-  subpackages:
-  - assert
-  - require
diff --git a/glide.yaml b/glide.yaml
deleted file mode 100644
index bab5d17f0..000000000
--- a/glide.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-package: github.com/tendermint/abci
-import:
-- package: github.com/gogo/protobuf
-  version: ^1.0.0
-  subpackages:
-  - proto
-- package: github.com/pkg/errors
-  version: v0.8.0
-- package: github.com/spf13/cobra
-  version: v0.0.1
-- package: github.com/tendermint/tmlibs
-  version: v0.7.0
-  subpackages:
-  - common
-  - db
-  - log
-  - process
-- package: golang.org/x/net
-  subpackages:
-  - context
-- package: google.golang.org/grpc
-  version: v1.7.3
-testImport:
-- package: github.com/stretchr/testify
-  version: v1.2.1
-  subpackages:
-  - assert
-  - require