Rebase to ethereum-master

Author: cpacia

Dockerfile.dev

@@ -1,28 +1,4 @@
-FROM golang:1.11
-VOLUME /var/lib/openbazaar
-
-RUN wget https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tgz && \
-    tar xvf Python-3.6.0.tgz && \
-    cd Python-3.6.0 && \
-    ./configure --enable-optimizations && \
-    make -j8
-RUN apt-get update && apt-get install -yq zlib1g-dev libssl-dev unzip
-RUN cd Python-3.6.0 && \
-    make altinstall && \
-    ln -s /usr/local/bin/python3.6 /usr/local/bin/python3
-
-COPY ./qa/requirements.txt ./requirements.txt
-
-RUN pip3.6 install --upgrade pip && \
-    pip3.6 install -r requirements.txt && \
-    wget https://bitcoin.org/bin/bitcoin-core-0.16.3/bitcoin-0.16.3-x86_64-linux-gnu.tar.gz && \
-    tar -xvzf bitcoin-0.16.3-x86_64-linux-gnu.tar.gz -C /opt
-
-RUN wget https://github.com/google/protobuf/releases/download/v3.6.0/protoc-3.6.0-linux-x86_64.zip && \
-    unzip ./protoc-3.6.0-linux-x86_64.zip -x readme.txt && \
-    mv ./include/* /usr/local/include/ && \
-    mv ./bin/protoc /usr/local/bin/ && \
-    rm -rf ./include ./bin
+FROM openbazaar/server-qa:0.10
 
 RUN go get -u github.com/gogo/protobuf/proto \
               github.com/golang/protobuf/protoc-gen-go \

Dockerfile.qa

@@ -0,0 +1,34 @@
+FROM golang:1.11
+
+ENV BITCOIND_VERSION=0.16.3
+ENV BITCOIND_PATH=/opt/bitcoin-${BITCOIND_VERSION}
+
+# software installs, from most stable to most volatile
+RUN apt-get update -y
+RUN apt-get install -yq software-properties-common \
+                        zlib1g-dev \
+                        libssl-dev \
+                        unzip \
+                        python3 \
+                        python3-pip
+
+RUN wget https://github.com/google/protobuf/releases/download/v3.6.0/protoc-3.6.0-linux-x86_64.zip && \
+    unzip ./protoc-3.6.0-linux-x86_64.zip -x readme.txt && \
+    mv ./include/* /usr/local/include/ && \
+    mv ./bin/protoc /usr/local/bin/ && \
+    rm -rf ./include ./bin
+
+COPY ./qa/requirements.txt ./requirements.txt
+
+RUN python3 -m pip install --upgrade pip && \
+    pip install -r ./requirements.txt && \
+    wget https://bitcoin.org/bin/bitcoin-core-0.16.3/bitcoin-${BITCOIND_VERSION}-x86_64-linux-gnu.tar.gz && \
+    tar -xvzf bitcoin-${BITCOIND_VERSION}-x86_64-linux-gnu.tar.gz -C /opt
+
+WORKDIR /go/src/github.com/OpenBazaar/openbazaar-go
+
+COPY ./Makefile ./Makefile
+
+VOLUME /go/src/github.com/OpenBazaar/openbazaar-go
+
+CMD make qa_test

Godeps/Godeps.json

@@ -1,11 +1,31 @@
+.DEFAULT_GOAL := help
+
+##
+## Global ENV vars
+##
+
+GIT_SHA ?= $(shell git rev-parse --short=8 HEAD)
+GIT_TAG ?= $(shell git describe --tags --abbrev=0)
+
+##
+## Helpful Help
+##
+
+.PHONY: help
+help:
+	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
+
+
 ##
 ## Building
 ##
 
-ios_framework:
+.PHONY: ios_framework
+ios_framework: ## Build iOS Framework for mobile
 	gomobile bind -target=ios github.com/OpenBazaar/openbazaar-go/mobile
 
-android_framework:
+.PHONY: android_framework
+android_framework: ## Build Android Framework for mobile
 	gomobile bind -target=android github.com/OpenBazaar/openbazaar-go/mobile
 
 ##
@@ -17,32 +37,62 @@ P_ANY = Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any
 PKGMAP = $(P_TIMESTAMP),$(P_ANY)
 
 .PHONY: protos
-protos:
+protos: ## Build go files for proto definitions
 	cd pb/protos && PATH=$(PATH):$(GOPATH)/bin protoc --go_out=$(PKGMAP):.. *.proto
 
+
+##
+## Testing
+##
+OPENBAZAARD_NAME ?= openbazaard-$(GIT_SHA)
+BITCOIND_PATH ?= .
+
+.PHONY: openbazaard
+openbazaard: ## Build daemon
+	$(info "Building openbazaar daemon...")
+	go build -o ./$(OPENBAZAARD_NAME) .
+
+.PHONY: qa_test
+qa_test: openbazaard ## Run QA test suite against current working copy
+	$(info "Running QA... (openbazaard: ../$(OPENBAZAARD_NAME) bitcoind: $(BITCOIND_PATH)/bin/bitcoind)")
+	(cd qa && ./runtests.sh ../$(OPENBAZAARD_NAME) $(BITCOIND_PATH)/bin/bitcoind)
+
+.PHONY: qa_eth_test
+qa_eth_test: openbazaard ## Run ETH-based QA test suite against current working copy
+	$(info "Running ETH QA... (openbazaard: ../$(OPENBAZAARD_NAME))")
+	(cd qa && ./runtests_eth.sh ../$(OPENBAZAARD_NAME))
+
 ##
 ## Docker
 ##
-DOCKER_PROFILE ?= openbazaar
-DOCKER_VERSION ?= $(shell git describe --tags --abbrev=0)
-DOCKER_IMAGE_NAME ?= $(DOCKER_PROFILE)/server:$(DOCKER_VERSION)
-
-.PHONY: docker
-docker:
-	docker build -t $(DOCKER_IMAGE_NAME) .
-
-.PHONY: push_docker
-push_docker:
-	docker push $(DOCKER_IMAGE_NAME)
-
-.PHONY: qa
-qa:
-	go build -o ./openbazaar-qa ./openbazaard.go
-	(cd qa && ./runtests.sh ../openbazaar-qa /opt/bitcoin-0.16.3/bin/bitcoind)
-	rm ./openbazaar-qa
-
-.PHONY: qa_eth
-qa_eth:
-	go build -o ./openbazaar-qa ./openbazaard.go
-	(cd qa && ./runtests_eth.sh ../openbazaar-qa)
-	rm ./openbazaar-qa
+PUBLIC_DOCKER_REGISTRY ?= openbazaar
+QA_DEV_TAG ?= 0.10
+
+DOCKER_SERVER_IMAGE_NAME ?= $(PUBLIC_DOCKER_REGISTRY)/server:$(GIT_TAG)
+DOCKER_QA_IMAGE_NAME ?= $(PUBLIC_DOCKER_REGISTRY)/server-qa:$(QA_DEV_TAG)
+DOCKER_DEV_IMAGE_NAME ?= $(PUBLIC_DOCKER_REGISTRY)/server-dev:$(QA_DEV_TAG)
+
+
+.PHONY: docker_build
+docker_build: ## Build container for daemon
+	docker build -t $(DOCKER_SERVER_IMAGE_NAME) .
+
+.PHONY: docker_push
+docker_push: docker ## Push container for daemon
+	docker push $(DOCKER_SERVER_IMAGE_NAME)
+
+.PHONY: qa_docker_build
+qa_docker_build: ## Build container with QA test dependencies included
+	docker build -t $(DOCKER_QA_IMAGE_NAME) -f ./Dockerfile.qa .
+
+.PHONY: qa_docker_push
+qa_docker_push: qa_docker_build ## Push container for daemon QA test environment
+	docker push $(DOCKER_QA_IMAGE_NAME)
+
+.PHONY: dev_docker_build
+dev_docker: ## Build container with dev dependencies included
+	docker build -t $(DOCKER_DEV_IMAGE_NAME) -f ./Dockerfile.dev .
+
+.PHONY: dev_docker_push
+dev_docker_push: dev_docker_build ## Push container for daemon dev environment
+	docker push $(DOCKER_DEV_IMAGE_NAME)