Use godep with GO15VENDOREXPERIMENT, vendor yaml.v2

Azure · Sep 15, 2015 · 36aa692 · 36aa692
1 parent 6a253bf
commit 36aa692
Show file tree

Hide file tree

Showing 29 changed files with 11,089 additions and 5 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/Readme b/Godeps/Readme
diff --git a/Makefile b/Makefile
@@ -27,14 +27,13 @@ bundle: clean binary
 	zip ./$(BUNDLEDIR)/$(BUNDLE) ./scripts/run-in-background.sh
 	@echo "OK: Use $(BUNDLEDIR)/$(BUNDLE) to publish the extension."
 binary:
-	GOPATH=`pwd` go get -v ./...
-	GOOS=linux GOARCH=amd64 GOPATH=`pwd` \
-		go build -v -o $(BINDIR)/$(BIN) docker-extension
+	if [ -z "$$GOPATH" ]; then echo "GOPATH is not set"; exit 1; fi
+	GOOS=linux GOARCH=amd64 go build -v -o $(BINDIR)/$(BIN) . 
 test:
-	GOPATH=`pwd` go test docker-extension/... -test.v
+	if [ -z "$$GOPATH" ]; then echo "GOPATH is not set"; exit 1; fi
+	go test docker-extension/... -test.v
 clean:
 	rm -rf "$(BUNDLEDIR)"
-	rm -rf "pkg"
 	rm -rf "$(BINDIR)"
 publish:
 	@read -p "Storage account key for uploading: " STORAGE_KEY && \

diff --git a/op_disable.go → op-disable.go b/op_disable.go → op-disable.go
diff --git a/op_enable.go → op-enable.go b/op_enable.go → op-enable.go
diff --git a/op_enable_test.go → op-enable_test.go b/op_enable_test.go → op-enable_test.go
diff --git a/op_install.go → op-install.go b/op_install.go → op-install.go
diff --git a/op_uninstall.go → op-uninstall.go b/op_uninstall.go → op-uninstall.go
diff --git a/op_update.go → op-update.go b/op_update.go → op-update.go
diff --git a/operations.go → op.go b/operations.go → op.go
diff --git a/vendor/gopkg.in/yaml.v2/LICENSE b/vendor/gopkg.in/yaml.v2/LICENSE
diff --git a/vendor/gopkg.in/yaml.v2/LICENSE.libyaml b/vendor/gopkg.in/yaml.v2/LICENSE.libyaml
diff --git a/vendor/gopkg.in/yaml.v2/README.md b/vendor/gopkg.in/yaml.v2/README.md