Fix minor details in builder

Author: thejsj

ansible/delta-hosts/variables

@@ -1,5 +1,4 @@
 [agreeable-egret:vars]
-agreeable_egret_port=65520
 egret_pg_host=delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com
 egret_pg_port=5432
 egret_pg_user=egret

ansible/gamma-hosts/variables

@@ -1,5 +1,4 @@
 [agreeable-egret:vars]
-agreeable_egret_port=65520
 egret_pg_host=gamma-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:32659
 egret_pg_port=32659
 egret_pg_user=egret

ansible/group_vars/all.yml

@@ -48,6 +48,7 @@ core_file_dir: /docker/app-cores
 
 # agreeable-egret
 agreeable_egret_hostname: egret.{{ domain }}
+agreeable_egret_port: 65520
 
 #angular
 angular_url: https://app.{{ domain }}

ansible/roles/builder/templates/basic_node/Dockerfile

@@ -1,5 +1,9 @@
 FROM node:{{ node_version }}
 
+{% if npm_version is defined %}
+RUN npm install npm@{{ npm_version }} -g
+{% endif %}
+
 {% if hosted_ports is defined %}
 # Expose port to Host
 EXPOSE {% for hosted_port in hosted_ports %}{{ hosted_port }} {% endfor %}
@@ -29,7 +33,7 @@ ADD ./repo/package.json /{{ name }}/package.json
 
 # Add shrinkwrap from the current build context (`.` is the repo) first
 # If we change a non first-level dependency, this will break cache as expected
-{% if has_shrinkwrap is defined %}
+{% if has_shrinkwrap is defined  and has_shrinkwrap %}
 ADD ./repo/npm-shrinkwrap.json /{{ name }}/npm-shrinkwrap.json
 {% endif %}