From 8b53f38cba004b886aea6476b22f3329e25a8a5a Mon Sep 17 00:00:00 2001 From: Troy Biesterfeld Date: Mon, 24 May 2021 14:15:39 -0500 Subject: [PATCH] Issue #2086 - Change default bulkdata directory Signed-off-by: Troy Biesterfeld --- docs/src/pages/guides/FHIRServerUsersGuide.md | 4 ++-- fhir-install/Dockerfile | 3 ++- .../liberty-config/config/default/fhir-server-config.json | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docs/src/pages/guides/FHIRServerUsersGuide.md b/docs/src/pages/guides/FHIRServerUsersGuide.md index 13221891e86..55f413da549 100644 --- a/docs/src/pages/guides/FHIRServerUsersGuide.md +++ b/docs/src/pages/guides/FHIRServerUsersGuide.md @@ -1320,7 +1320,7 @@ The Bulk Data web application writes the exported FHIR resources to an IBM Cloud "storageProviders": { "default" : { "type": "file", - "fileBase": "${WLP_OUTPUT_DIR}/fhir-server/output", + "fileBase": "/output/bulkdata", "exportPublic": true, "disableOperationOutcomes": true, "duplicationCheck": false, @@ -2071,7 +2071,7 @@ This section contains reference information about each of the configuration prop |`fhirServer/bulkdata/storageProviders//location`|string|Object store location | |`fhirServer/bulkdata/storageProviders//endpointInternal`|string|Object store end point url used to read/write from COS | |`fhirServer/bulkdata/storageProviders//endpointExternal`|string|Object store end point url used in the constructed download URLs| -|`fhirServer/bulkdata/storageProviders//fileBase`|string| The absolute path of the output directory | +|`fhirServer/bulkdata/storageProviders//fileBase`|string| The absolute path of the output directory. It may be desirable to set this to a path within a mount point of separate file system if large amounts of data are involved| |`fhirServer/bulkdata/storageProviders//validBaseUrls`|list|The list of supported urls which are approved for the fhir server to access| |`fhirServer/bulkdata/storageProviders//disableBaseUrlValidation`|boolean|Disables the URL checking feature, allowing all URLs to be imported| |`fhirServer/bulkdata/storageProviders//exportPublic`|boolean|Whether or not the server is configured to support export to parquet; to properly enable it the administrator must first make spark and stocator available to the fhir-bulkdata-webapp (e.g through the shared lib at `wlp/user/shared/resources/lib`)| diff --git a/fhir-install/Dockerfile b/fhir-install/Dockerfile index e5537d86a89..22105db0910 100644 --- a/fhir-install/Dockerfile +++ b/fhir-install/Dockerfile @@ -52,7 +52,8 @@ RUN features.sh COPY --chown=1001:0 --from=base /opt/ol/wlp/usr /opt/ol/wlp/usr -RUN configure.sh +RUN configure.sh && \ + mkdir -p /output/bulkdata COPY --chown=1001:0 --from=base /opt/ibm-fhir-server /opt/ibm-fhir-server diff --git a/fhir-server/liberty-config/config/default/fhir-server-config.json b/fhir-server/liberty-config/config/default/fhir-server-config.json index e2b91810b13..6e2e9acd576 100644 --- a/fhir-server/liberty-config/config/default/fhir-server-config.json +++ b/fhir-server/liberty-config/config/default/fhir-server-config.json @@ -170,7 +170,7 @@ "type": "file", "_type": "ibm-cos|aws-s3|file|https", "validBaseUrls": [], - "fileBase": "/fhir-server/output", + "fileBase": "/output/bulkdata", "bucketName": "fhir-performance", "location": "us", "endpointInternal": "https://s3.us-east.cloud-object-storage.appdomain.cloud",