refactor directory structure for docker automated build

nec-baas · Nov 19, 2018 · e326043 · e326043
1 parent e891b32
commit e326043
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 706 deletions.
diff --git a/api/Dockerfile → Dockerfile.api b/api/Dockerfile → Dockerfile.api
diff --git a/both/Dockerfile → Dockerfile.both b/both/Dockerfile → Dockerfile.both
diff --git a/console/Dockerfile → Dockerfile.console b/console/Dockerfile → Dockerfile.console
diff --git a/Makefile b/Makefile
@@ -13,25 +13,25 @@ all: api console both
 #download:
 #	@./download.sh
 
-update: api/Dockerfile console/Dockerfile both/Dockerfile
+update: Dockerfile.api Dockerfile.console Dockerfile.both
 
-api/Dockerfile: Dockerfile.in
-	@cat Dockerfile.in | sed "s/%%SERVER_TYPE%%/api/" > api/Dockerfile
+Dockerfile.api: Dockerfile.in
+	@cat Dockerfile.in | sed "s/%%SERVER_TYPE%%/api/" > $@
 
-console/Dockerfile: Dockerfile.in
-	@cat Dockerfile.in | sed "s/%%SERVER_TYPE%%/console/" > console/Dockerfile
+Dockerfile.console: Dockerfile.in
+	@cat Dockerfile.in | sed "s/%%SERVER_TYPE%%/console/" > $@
 
-both/Dockerfile: Dockerfile.in
-	@cat Dockerfile.in | sed "s/%%SERVER_TYPE%%/*/" > both/Dockerfile
+Dockerfile.both: Dockerfile.in
+	@cat Dockerfile.in | sed "s/%%SERVER_TYPE%%/*/" > $@
 
 api:
-	docker build -t $(NAME_API) -f api/Dockerfile .
+	docker build -t $(NAME_API) -f Dockerfile.api .
 
 console:
-	docker build -t $(NAME_CONSOLE) -f console/Dockerfile .
+	docker build -t $(NAME_CONSOLE) -f Dockerfile.console .
 
 both:
-	docker build -t $(NAME_BOTH) -f both/Dockerfile .
+	docker build -t $(NAME_BOTH) -f Dockerfile.both .
 
 rmi:
 	docker rmi $(NAME_API) $(NAME_CONSOLE)

diff --git a/api/bootstrap.sh → bootstrap.sh b/api/bootstrap.sh → bootstrap.sh
diff --git a/both/bootstrap.sh b/both/bootstrap.sh
diff --git a/both/logback.template.properties b/both/logback.template.properties
diff --git a/both/properties.template.xml b/both/properties.template.xml
diff --git a/both/server.template.xml b/both/server.template.xml