ref(mock-store): move to tests/ and rename "mock-store"

Author: mboersma

store/Makefile

@@ -9,8 +9,6 @@ GATEWAY_IMAGE = $(IMAGE_PREFIX)store-gateway:$(BUILD_TAG)
 GATEWAY_DEV_IMAGE = $(DEV_REGISTRY)/$(GATEWAY_IMAGE)
 METADATA_IMAGE = $(IMAGE_PREFIX)store-metadata:$(BUILD_TAG)
 METADATA_DEV_IMAGE = $(DEV_REGISTRY)/$(METADATA_IMAGE)
-MOCK_IMAGE = $(IMAGE_PREFIX)store-mock:$(BUILD_TAG)
-MOCK_DEV_IMAGE = $(DEV_REGISTRY)/$(MOCK_IMAGE)
 MONITOR_IMAGE = $(IMAGE_PREFIX)store-monitor:$(BUILD_TAG)
 MONITOR_DEV_IMAGE = $(DEV_REGISTRY)/$(MONITOR_IMAGE)
 
@@ -22,7 +20,6 @@ build: check-docker
 		docker build -t deis/store-$(I):$(BUILD_TAG) $(I)/ ; \
 		rm $(I)/Dockerfile ; \
 	)
-	docker build -t $(MOCK_IMAGE) mock/
 
 clean: check-docker check-registry
 	$(foreach I, $(BUILT_IMAGES), \
@@ -77,8 +74,6 @@ push: check-registry
 	docker push $(GATEWAY_DEV_IMAGE)
 	docker tag $(METADATA_IMAGE) $(METADATA_DEV_IMAGE)
 	docker push $(METADATA_DEV_IMAGE)
-	docker tag $(MOCK_IMAGE) $(MOCK_DEV_IMAGE)
-	docker push $(MOCK_DEV_IMAGE)
 	docker tag $(MONITOR_IMAGE) $(MONITOR_DEV_IMAGE)
 	docker push $(MONITOR_DEV_IMAGE)
 
@@ -92,7 +87,6 @@ release:
 	docker push $(DAEMON_IMAGE)
 	docker push $(GATEWAY_IMAGE)
 	docker push $(METADATA_IMAGE)
-	docker push $(MOCK_IMAGE)
 	docker push $(MONITOR_IMAGE)
 
 deploy: build dev-release restart

tests/Makefile

@@ -1,3 +1,7 @@
+include ../includes.mk
+
+MOCK_STORE_IMAGE = $(IMAGE_PREFIX)mock-store:latest
+
 test: test-smoke
 
 test-smoke: test-style
@@ -22,6 +26,9 @@ setup-root-gotools:
 setup-gotools:
 	go get -v github.com/golang/lint/golint
 
+mock-store:
+	docker build -t $(MOCK_STORE_IMAGE) fixtures/mock-store/
+
 test-style:
 	go vet -x ./...
 	-golint ./...

store/mock/Dockerfile tests/fixtures/mock-store/Dockerfilestore/mock/Dockerfile renamed to tests/fixtures/mock-store/Dockerfile

@@ -1,35 +1,35 @@
 # Mock S3 storage
 
-The objective is to not require a Ceph cluster in the test to provide a S3 compatible service.
-This component uses [mock-s3](https://github.com/jserver/mock-s3).
+The objective is to provide an S3-compatible service for tests, so a Ceph cluster
+is not required. This component uses [mock-s3](https://github.com/jserver/mock-s3).
 
 ## Usage:
 
 ```
-docker run -p 8888:8888 -e HOST=$COREOS_PRIVATE_IPV4 -v <local directory>:/app/storage deis/store-mock
+docker run -p 8888:8888 -e HOST=$COREOS_PRIVATE_IPV4 -v <local directory>:/app/storage deis/mock-store
 ```
 
 *The use of a local directory `(-v <local directory>)` is optional*
 
 
-`mock-s3` does not requires an ACCESS_KEY and SECRET_KEY (there is no concept of permissions) but this
-component will generate both keep compatibility with `deis-store-gateway`
+`mock-s3` does not requires an `ACCESS_KEY` and `SECRET_KEY` (there is no concept of permissions), but this
+component will generate both to keep compatibility with `deis-store-gateway`.
 
 ## Containers
 
-The mock store component is composed by one container:
+The mock store component is composed of one container:
 
-* [store-mock](https://index.docker.io/u/deis/store-mock/) - the blob store gateway,
+* [mock-store](https://index.docker.io/u/deis/mock-store/) - the blob store gateway,
 offering a S3-compatible bucket APIs using the local filesystem as storage.
 
 ## Usage
 
 Please consult the [Makefile](Makefile) for current instructions on how to build, test, push,
-install, and start **deis/store-mock**.
+install, and start **deis/mock-store**.
 
 ## License
 
-© 2014 OpDemand LLC
+© 2015 OpDemand LLC
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may
 not use this file except in compliance with the License. You may obtain