From 7b6d38d65bb505ee6b49f0b0b120c07d4bb18cc9 Mon Sep 17 00:00:00 2001
From: hoatle <hoatle@teracy.com>
Date: Mon, 20 Mar 2017 16:05:12 +0700
Subject: [PATCH] @ #30 | minor updates for teracy-dev best practices

---
 .gitignore                  | 7 +++++--
 dist/.gitkeep               | 0
 docker-compose.prod.tpl.yml | 1 +
 docker-compose.tpl.yml      | 1 +
 node_modules/.gitkeep       | 0
 setup.sh                    | 4 ++--
 6 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 dist/.gitkeep
 create mode 100644 node_modules/.gitkeep

diff --git a/.gitignore b/.gitignore
index 142f467..4f8273f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
 # See http://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist
+/dist/*
 /tmp
 
 # dependencies
-/node_modules
+/node_modules/*
 
 # IDEs and editors
 /.idea
@@ -39,6 +39,9 @@ testem.log
 .DS_Store
 Thumbs.db
 .env
+# for teracy-dev file mapping
+!dist/.gitkeep
+!node_modules/.gitkeep
 
 # angular-boilerplate
 .angular-cli.json
diff --git a/dist/.gitkeep b/dist/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/docker-compose.prod.tpl.yml b/docker-compose.prod.tpl.yml
index 4f2d9cb..13accde 100644
--- a/docker-compose.prod.tpl.yml
+++ b/docker-compose.prod.tpl.yml
@@ -3,6 +3,7 @@ version: '3'
 services:
 
   prod:
+    container_name: ${PROJECT_NAME}_dev
     build:
       context: .
       args:
diff --git a/docker-compose.tpl.yml b/docker-compose.tpl.yml
index be9b740..8c5f3f7 100644
--- a/docker-compose.tpl.yml
+++ b/docker-compose.tpl.yml
@@ -3,6 +3,7 @@ version: '3'
 services:
 
   dev:
+    container_name: ${PROJECT_NAME}_dev
     build:
       context: .
       dockerfile: Dockerfile-dev
diff --git a/node_modules/.gitkeep b/node_modules/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/setup.sh b/setup.sh
index 5f9feaa..11e3750 100755
--- a/setup.sh
+++ b/setup.sh
@@ -10,8 +10,8 @@ envsubst '${PROJECT_NAME} ${PROJECT_VERSION} ${DOMAIN_DEV}' <package.tpl.json >p
 
 # generate docker-compose.yml
 rm -rf docker-compose.yml
-envsubst '${DOCKER_IMAGE_DEV} ${DOMAIN_DEV}' <docker-compose.tpl.yml >docker-compose.yml
+envsubst '${PROJECT_NAME} ${DOCKER_IMAGE_DEV} ${DOMAIN_DEV}' <docker-compose.tpl.yml >docker-compose.yml
 
 # generate docker-compose.prod.yml
 rm -rf docker-compose.prod.yml
-envsubst '${DOCKER_IMAGE_PROD} ${DOMAIN_PROD}' <docker-compose.prod.tpl.yml >docker-compose.prod.yml
+envsubst '${PROJECT_NAME} ${DOCKER_IMAGE_PROD} ${DOMAIN_PROD}' <docker-compose.prod.tpl.yml >docker-compose.prod.yml