Skip to content

Astral refactor #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anandkumarpatel merged 4 commits into from
Oct 14, 2015
Merged

Astral refactor #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
91b80af
Changes so we can deploy shiva from within the astral project.
Oct 13, 2015
e0f48d1
Changed DB and Repo name for shiva (now astral)
Oct 13, 2015
fb897e6
Node versions and container image name for shiva.
Oct 14, 2015
da8870e
Update alpha-shiva.yml
Oct 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/beta-hosts/variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ datadog_tags=env:beta
domain=runnable-beta.com
new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
node_env=production-beta
pg_database=shiva
pg_database=astral
pg_host=beta-infrastructure-db.cnksgdqarobf.us-west-2.rds.amazonaws.com
pg_pass=QBjSpAXVYwmGHu4Y
pg_user=shiva
Expand Down
10 changes: 6 additions & 4 deletions ansible/group_vars/alpha-shiva.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"]
Expand Down
2 changes: 1 addition & 1 deletion ansible/prod-hosts/variables
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ datadog_tags=env:alpha
domain=runnable.io
new_relic_license_key=338516e0826451c297d44dc60aeaf0a0ca4bfead
node_env=production
pg_database=shiva
pg_database=astral
pg_host=alpha-production-db.czw5moz6rmpp.us-west-1.rds.amazonaws.com:30573
pg_pass=wCJGCfCWE9CKmQwa2XUKj6d8WYcEZAb9
pg_user=shiva
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/builder/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
---
build_dir: /opts/builds/docker_build/
npm_start_command: start
2 changes: 1 addition & 1 deletion ansible/roles/builder/templates/basic_node/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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