@ #30 | minor updates for teracy-dev best practices

acme101 · Mar 20, 2017 · 7b6d38d · 7b6d38d
1 parent 687b007
commit 7b6d38d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 4 deletions.
diff --git 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
diff --git 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
@@ -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
diff --git 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