Merge branch 'release/1.0.0-alpha.3'

README.md

@@ -121,6 +121,10 @@ Follow the interactive directions for setting up this CLI.  You will need the el
 
 Here is a summary of what you need to do. See the Boardwalk [README](boardwalk/README.md) for details.
 
+#### Changing the maximum virtual memory in your VM
+
+ElasticSearch requires that you set `vm.max_map_count` to at least _262144_. The bootstrap installer will take care of this. However, the changes are not permanent, and if you restart your VM, `vm.max_map_count` will change to its default. To make this change permanent, edit the file `/etc/sysctl.conf` on your VM and add/edit this line: `vm.max_map_count=262144`. This will make the change permanent even in the case the VM is restarted.
+
 #### Create a Google Oauth2 app
 
 You need to create a Google Oauth2 app to enable Login and token download from the dashboard. If you don't want to enable this on the dashboard during installation, simply enter a random string when asked for the *Google Client ID* and the *Google Client Secret*. You can consult [here](http://bitwiser.in/2015/09/09/add-google-login-in-flask.html#creating-a-google-project) under "Creating A Google Project" if you want to read more details. Here is a summary of what you need to do:

action/action_compose.yml

@@ -2,7 +2,7 @@ version: '2'
 
 services:
   dcc-action:
-    image: quay.io/ucsc_cgl/action-service:1.0.4
+    image: quay.io/ucsc_cgl/action-service:1.0.5
     container_name: "action-service"
     environment:
       STORAGE_ACCESS_TOKEN: "${storage_access_token}"

boardwalk/dev.yml

@@ -12,8 +12,8 @@ services:
       REDWOOD_ENDPOINT: "${redwood_server}"
       ES_SERVICE: "${es_service}"
       DATABASE_URL: "${database_url}"
-#    command: "--storage-access-token ${redwood_access_token} --server-host ${redwood_server} --skip-uuid-directory /app/dcc-metadata-indexer/redacted --skip-program TEST --skip-project TEST --es-service ${es_service} --cron-job" 
-    command: "--storage-access-token ${redwood_access_token} --server-host ${redwood_server} --skip-uuid-directory /app/dcc-metadata-indexer/redacted --es-service ${es_service} --cron-job"
+    command: "--storage-access-token ${redwood_access_token} --server-host ${redwood_server} --skip-uuid-directory /app/dcc-metadata-indexer/redacted --skip-program TEST --skip-project TEST --es-service ${es_service} --cron-job" 
+#    command: "--storage-access-token ${redwood_access_token} --server-host ${redwood_server} --skip-uuid-directory /app/dcc-metadata-indexer/redacted --es-service ${es_service} --cron-job"
     volumes:
       - ~/dcc-metadata-indexer/es-jsonls:/app/dcc-metadata-indexer/es-jsonls
       - ~/dcc-metadata-indexer/endpoint_metadata:/app/dcc-metadata-indexer/endpoint_metadata

consonance/docker-compose.yml

@@ -6,6 +6,7 @@ services:
     image: postgres:9.5
     networks:
       - default
+    restart: always
 
   rabbitmq:
     image: rabbitmq:3.5.6-management
@@ -14,6 +15,7 @@ services:
       - "5672:5672"
     networks:
       - default
+    restart: always
 
   webservice:
     build:
@@ -31,6 +33,7 @@ services:
     networks:
       - default
       - esnet
+    restart: always
 
   coordinator:
     build:
@@ -43,6 +46,7 @@ services:
       - log_volume:/consonance_logs
     networks:
       - default
+    restart: always
 
   provisioner:
     build:
@@ -55,6 +59,7 @@ services:
       - log_volume:/consonance_logs
     networks:
       - default
+    restart: always
 
   client:
     build:
@@ -74,6 +79,7 @@ services:
       - PGDATABASE=postgres
     networks:
       - default
+    restart: always
 
 volumes:
   log_volume:

install_bootstrap

@@ -887,6 +887,10 @@ CONFIG
       mustache boardwalk_launcher_config/boardwalk.config boardwalk/conf/aws.config.template > boardwalk/aws.config
 
       cd boardwalk
+      #Bringing stuff down in case there are some cached containers
+      echo "Bringing down any Boardwalk existing container"
+      sudo docker-compose -f ${boardwalk_mode}.yml down -v
+      echo "Creating Boardwalk associated containers"
       sudo docker-compose -f ${boardwalk_mode}.yml up -d
       cd ..
 

test/purge_docker.sh

@@ -11,4 +11,4 @@ docker volume rm $(docker volume ls -f dangling=true -q)
 
 sudo rm -r /root/dcc-dashboard-service
 sudo rm -r /root/dcc-metadata-indexer
-sudo rm -r /root/dcc-actions-service
+sudo rm -r /root/dcc-action-service