OSDN Git Service

test-container: fix Makefile for searchd
authorhylom <hylom@users.osdn.me>
Tue, 25 Sep 2018 12:46:56 +0000 (21:46 +0900)
committerhylom <hylom@users.osdn.me>
Tue, 25 Sep 2018 12:46:56 +0000 (21:46 +0900)
test-container/Makefile

index 417b39c..08837d5 100644 (file)
@@ -2,6 +2,7 @@ TAG_NAME=newslash-base
 HOST_NAME= sdtest.osdn.co.jp:5000
 NEWSLASH_DIR=$(shell pwd)/../
 PORT_OPTS=-p 3000:3000
+SEARCHD_DOCKERFILE=Dockerfile_for_searchd
 
 build-base: Dockerfile files
        docker build $(DOCKER_OPTS) -t newslash-base .
@@ -9,12 +10,15 @@ build-base: Dockerfile files
 run:
        docker run -ti --rm $(PORT_OPTS) -v $(NEWSLASH_DIR):/var/newslash newslash-base bash
 
+searchd: $(SEARCHD_DOCKERFILE) files
+       docker build $(DOCKER_OPTS) -f $< -t newslash-searchd-base .
+
+searchd-run:
+       docker run -ti --rm -p 6000:6000 -v $(NEWSLASH_DIR):/var/newslash newslash-searchd-base bash
+
 build-k8s-test:
        docker build -f Dockerfile_k8s $(DOCKER_OPTS) -t $(HOST_NAME)/osdn/newslash-test .
 
-build-searchd-base: Dockerfile_for_searchd
-       docker build -f Dockerfile_for_searchd $(DOCKER_OPTS) -t ns_searchd .
-
 push:
        docker push $(HOST_NAME)/osdn/newslash-test