Merge pull request #99 from isucon/feature/development-docker

benchのビルド設定が間違っていた, Docker for Macだとこの設定だとビルドできなかった

development/Makefile

@@ -1,10 +1,10 @@
 .PHONY: install-initialdata init-mysql run-bench run-bench-noload
 
 up/%:
-	docker compose -f docker-compose-$*.yml -f docker-compose-common.yml up -d 
+	docker compose -f docker-compose-$*.yml -f docker-compose-common.yml up --build -d
 
 down/%:
-	docker compose -f docker-compose-$*.yml -f docker-compose-common.yml down -d
+	docker compose -f docker-compose-$*.yml -f docker-compose-common.yml down
 
 logs-webapp/%:
 	docker compose -f docker-compose-$*.yml -f docker-compose-common.yml logs -f webapp

development/docker-compose-common.yml

@@ -27,9 +27,7 @@ services:
     restart: always
 
   blackauth:
-    build:
-      context: ../
-      dockerfile: ./development/backend-go/Dockerfile
+    build: ./backend-go
     ports:
       - "3001:3001"
     init: true
@@ -43,7 +41,7 @@ services:
       - main.go
 
   bench:
-    build: ../webapp
+    build: ./backend-go
     stdin_open: true
     tty: true
     environment:

development/docker-compose-go.yml

@@ -4,9 +4,7 @@ services:
   webapp:
     cpus: 1
     mem_limit: 1g
-    build:
-      context: ../
-      dockerfile: ./development/backend-go/Dockerfile
+    build: ./backend-go
     environment:
       ISUCON_DB_HOST: mysql
       ISUCON_DB_PORT: 3306