From 2135ef25d84efc98eb75fe8349c61349ab67cf3d Mon Sep 17 00:00:00 2001 From: SimonKonar Date: Tue, 23 Jan 2024 15:17:16 +0100 Subject: [PATCH] fix: create compose.override.yaml file and update command in .github workflow --- .github/comp_override/compose.override.yaml | 11 +++++++++++ .github/workflows/build.yml | 18 ++---------------- 2 files changed, 13 insertions(+), 16 deletions(-) create mode 100644 .github/comp_override/compose.override.yaml diff --git a/.github/comp_override/compose.override.yaml b/.github/comp_override/compose.override.yaml new file mode 100644 index 0000000..21cd7c7 --- /dev/null +++ b/.github/comp_override/compose.override.yaml @@ -0,0 +1,11 @@ +version: '3.9' +services: + fhir-module: + environment: + PARSING_MAP_PATH: "/opt/fhir-module/util/default_csv_map.json" + MATERIAL_TYPE_MAP_PATH: "/opt/fhir-module/util/default_csv_material_type_map.json" + RECORDS_FILE_TYPE: "csv" + volumes: + - type: bind + source: "test/csv_data" + target: "/opt/records" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5aee2a..97a7893 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -171,22 +171,8 @@ jobs: - name: Create docker network run: docker network create system-test - - name: Generate compose.override.yaml file - run: | - echo "version: '3.9'" > compose.override.yaml - echo "services:" >> compose.override.yaml - echo " fhir-module:" >> compose.override.yaml - echo " environment:" >> compose.override.yaml - echo " PARSING_MAP_PATH: \"/opt/fhir-module/util/default_csv_map.json\"" >> compose.override.yaml - echo " MATERIAL_TYPE_MAP_PATH: \"/opt/fhir-module/util/default_csv_material_type_map.json\"" >> compose.override.yaml - echo " RECORDS_FILE_TYPE: \"csv\"" >> compose.override.yaml - echo " volumes:" >> compose.override.yaml - echo " - type: bind" >> compose.override.yaml - echo " source: \"test/csv_data\"" >> compose.override.yaml - echo " target: \"/opt/records\"" >> compose.override.yaml - - - name: Run sandbox in dev env - run: docker compose --profile dev up -d + - name: Run sandbox in dev env (use compose.override.yaml to work with csv files) + run: docker compose -f compose.yaml -f .github/comp_override/compose.override.yaml --profile dev up -d - name: Wait for Blaze run: .github/scripts/wait-for-url.sh http://localhost:8080/health