Refactor Dockerfile.dev to derive from latest Dockerfile.qa

Author: placer14

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 docker.dev.ob1.io/openbazaar-qa:0.10
 
 RUN go get -u github.com/gogo/protobuf/proto \
               github.com/golang/protobuf/protoc-gen-go \

Dockerfile.qa

@@ -18,18 +18,6 @@ RUN wget https://github.com/google/protobuf/releases/download/v3.6.0/protoc-3.6.
     mv ./bin/protoc /usr/local/bin/ && \
     rm -rf ./include ./bin
 
-RUN go get -u github.com/gogo/protobuf/proto \
-              github.com/golang/protobuf/protoc-gen-go \
-              github.com/icrowley/fake \
-              github.com/derekparker/delve/cmd/dlv \
-              github.com/tools/godep
-
-WORKDIR /go/src/github.com/golang/protobuf
-
-RUN git checkout tags/v1.2.0 -b v1.2.0 && \
-    cd protoc-gen-go && \
-    go install
-
 COPY ./qa/requirements.txt ./requirements.txt
 
 RUN python3 -m pip install --upgrade pip && \
@@ -38,7 +26,9 @@ RUN python3 -m pip install --upgrade pip && \
     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

Makefile

@@ -51,23 +51,23 @@ OB_DOCKER_REGISTRY ?= docker.dev.ob1.io
 
 DOCKER_IMAGE_NAME ?= $(PUBLIC_DOCKER_REGISTRY_PROFILE)/server:$(GIT_TAG)
 DOCKER_QA_IMAGE_NAME ?= $(OB_DOCKER_REGISTRY)/openbazaar-qa:$(GIT_SHA)
-DOCKER_DEV_IMAGE_NAME ?= $(OB_DOCKER_REGISTRY)/openbazaar-dev:$(GIT_SHA)
+DOCKER_DEV_IMAGE_NAME ?= openbazaar-dev:$(GIT_SHA)
 
 
 .PHONY: docker
 docker:
 	docker build -t $(DOCKER_IMAGE_NAME) .
 
 .PHONY: push_docker
-push_docker:
+push_docker: docker
 	docker push $(DOCKER_IMAGE_NAME)
 
 .PHONY: qa_docker
 qa_docker:
 	docker build -t $(DOCKER_QA_IMAGE_NAME) -f ./Dockerfile.qa .
 
 .PHONY: push_qa_docker
-push_qa_docker:
+push_qa_docker: qa_docker
 	docker push $(DOCKER_QA_IMAGE_NAME)
 
 .PHONY: dev_docker