Modify Makefile and circleci (#25)

Author: yu-iskw

.circleci/config.yml

@@ -35,7 +35,7 @@ jobs:
       - run:
           name: build docker image
           command: |
-            make build-docker-version
+            make build-docker-version DOCKER_IMAGE_TAG="build-${CIRCLE_BUILD_NUM}"
   build_and_push:
     <<: *container_config
     steps:
@@ -53,12 +53,12 @@ jobs:
       - run:
           name: build docker image
           command: |
-            make build-docker-version
+            make build-docker-version DOCKER_IMAGE_TAG="$CIRCLE_TAG"
       - run:
           name: push docker image
           command: |
             docker login -u "$DOCKERHUB_USER" -p "$DOCKERHUB_PASS"
-            make push-docker-version
+            make push-docker-version DOCKER_IMAGE_TAG="$CIRCLE_TAG"
 
 workflows:
   version: 2

Makefile

@@ -2,8 +2,7 @@
 # Copyright (c) 2017 Yu Ishikawa.
 #
 
-DOCKER_TAG := yuiskw/bigquery-to-datastore:latest
-DOCKER_TAG_VERSION := yuiskw/bigquery-to-datastore:$(shell bash ./dev/get-app-version.sh)-beam-2.1
+DOCKER_REPO := yuiskw/bigquery-to-datastore
 
 .PHONY: test checkstyle clean \
 		build-docker test-docker push-docker push-docker-latest push-docker-version
@@ -28,18 +27,18 @@ clean:
 build-docker: build-docker-latest build-docker-version
 
 build-docker-latest: package
-	docker build --rm -t $(DOCKER_TAG) .
+	docker build --rm -t $(DOCKER_REPO):latest .
 
-build-docker-version: package
-	docker build --rm -t $(DOCKER_TAG_VERSION) .
+build-docker-version: check-docker-image-tag package
+	docker build --rm -t $(DOCKER_REPO):$(DOCKER_IMAGE_TAG) .
 
 test-docker: build-docker
 	docker run --rm --entrypoint "bash" $(DOCKER_TAG) ./dev/test.sh
 
-push-docker: push-docker-latest push-docker-version
+push-docker: check-docker-image-tag
+	docker push $(DOCKER_REPO):$(DOCKER_TAG_TAG)
 
-push-docker-latest:
-	docker push $(DOCKER_TAG)
-
-push-docker-version:
-	docker push $(DOCKER_TAG_VERSION)
+check-docker-image-tag:
+ifndef DOCKER_IMAGE_TAG
+	$(error DOCKER_IMAGE_TAG is undefined)
+endif