diff --git a/app-infrastructure/dictionary-instance.tf b/app-infrastructure/dictionary-instance.tf index f52f115c..1f134d45 100644 --- a/app-infrastructure/dictionary-instance.tf +++ b/app-infrastructure/dictionary-instance.tf @@ -4,6 +4,7 @@ data "template_file" "dictionary-user_data" { stack_githash = var.stack_githash_long stack_s3_bucket = var.stack_s3_bucket target_stack = var.target_stack + dataset_s3_object_key = var.dataset-s3-object-key gss_prefix = "bdc_${var.env_is_open_access ? "open" : "auth"}_${var.environment_name}" } } diff --git a/app-infrastructure/scripts/dictionary-user_data.sh b/app-infrastructure/scripts/dictionary-user_data.sh index 312acfe0..eaa21f3f 100644 --- a/app-infrastructure/scripts/dictionary-user_data.sh +++ b/app-infrastructure/scripts/dictionary-user_data.sh @@ -24,6 +24,9 @@ s3_copy() { s3_copy s3://${stack_s3_bucket}/releases/jenkins_pipeline_build_${stack_githash}/pic-sure-hpds-dictionary-resource.tar.gz /home/centos/pic-sure-hpds-dictionary-resource.tar.gz +s3_copy s3://${stack_s3_bucket}/data/${dataset_s3_object_key}/fence_mapping.json /home/centos/fence_mapping.json +echo "pulled fence mapping" + sudo mkdir -p /usr/local/docker-config/search/ sudo mkdir -p /var/log/dictionary-docker-logs @@ -31,6 +34,7 @@ DICTIONARY_IMAGE=`sudo docker load < /home/centos/pic-sure-hpds-dictionary-resou sudo docker run --name=dictionary \ --log-driver syslog --log-opt tag=dictionary \ -v /var/log/dictionary-docker-logs/:/usr/local/tomcat/logs/ \ + -v /home/centos/fence_mapping.json:/usr/local/docker-config/search/fence_mapping.json \ -e CATALINA_OPTS=" -Xms1g -Xmx12g " \ -p 8080:8080 -d $DICTIONARY_IMAGE