merge with master

Author: anandkumarpatel

ansible/group_vars/all.yml

@@ -52,8 +52,10 @@ eru_api_host: api.{{ domain }}
 # rabbit
 rabbit_port: 54321
 
+# astral
+pg_database: astral
+
 # shiva
-pg_database: shiva
 pg_user: shiva
 
 # swarm

ansible/group_vars/alpha-image-builder.yml

@@ -4,4 +4,4 @@ name: "{{ app_name }}"
 image_builder_docker_namespace: runnable/image-builder
 
 # we need to push this
-do_not_push=false
+do_not_push: false

ansible/group_vars/alpha-shiva.yml

@@ -1,10 +1,12 @@
 name: "shiva"
-
 container_image: "registry.runnable.com/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
-repo: "git@github.com:CodeNow/{{ name }}.git"
-node_version: "0.10.38"
-npm_version: "2.1.18"
+repo: "git@github.com:CodeNow/astral.git"
+node_version: "4.2.1"
+npm_version: "2.8.3"
+
+# Overrides the start command in the builder role
+npm_start_command: "run shiva-start"
 
 # Not actually needed, just allows container-kill-start to work
 hosted_ports: ["3000"]

ansible/roles/builder/defaults/main.yml

@@ -1,2 +1,3 @@
 ---
 build_dir: /opts/builds/docker_build/
+npm_start_command: start

ansible/roles/builder/templates/basic_node/Dockerfile

@@ -34,4 +34,4 @@ RUN {{ command }}
 {% endif %}
 
 # Define default command.
-CMD ulimit -c unlimited && /usr/local/bin/npm start > /var/log/{{ name }}.log 2>&1
+CMD ulimit -c unlimited && /usr/local/bin/npm {{ npm_start_command }} > /var/log/{{ name }}.log 2>&1