Skip to content

Commit 47a75c8

Browse files
committed
fix compose: addef ile mounts for ontology
changed tagret path for backend zip download
1 parent b906a63 commit 47a75c8

File tree

2 files changed

+17
-9
lines changed

2 files changed

+17
-9
lines changed

.github/scripts/setup-ontology.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/bin/bash -e
22

3-
ONTOLOGY_GIT_TAG=${ONTOLOGY_GIT_TAG:-v3.8.1}
3+
ONTOLOGY_GIT_TAG=${ONTOLOGY_GIT_TAG:-v3.9.0-experimental.0}
44

5-
BASE_DIR="cypress/docker/ontology"
5+
BASE_DIR="../../cypress/docker/ontology"
66
DSE_DIR="$BASE_DIR/dse"
77
MIGRATION_DIR="$BASE_DIR/migration"
88

@@ -13,7 +13,7 @@ curl -fsSL -o "$BASE_DIR/backend.zip" \
1313
"https://github.com/medizininformatik-initiative/fhir-ontology-generator/releases/download/${ONTOLOGY_GIT_TAG}/backend.zip"
1414

1515
echo "Unzipping all files to ontology folder..."
16-
unzip -oj "$BASE_DIR/backend.zip" -d "$BASE_DIR"
16+
unzip -oj -o "$BASE_DIR/backend.zip" -d "$BASE_DIR"
1717

1818
echo "Moving profile_tree.json to ontology/dse/ folder..."
1919
mv "$BASE_DIR/profile_tree.json" "$DSE_DIR/" 2>/dev/null || true
@@ -26,7 +26,7 @@ curl -fsSL -o "$BASE_DIR/elastic.zip" \
2626
"https://github.com/medizininformatik-initiative/fhir-ontology-generator/releases/download/${ONTOLOGY_GIT_TAG}/elastic.zip"
2727

2828
echo "Cleaning up zip..."
29-
rm "$BASE_DIR/backend.zip"
29+
#rm "$BASE_DIR/backend.zip"
3030

3131
echo "Final files:"
3232
ls -l "$BASE_DIR"

cypress/docker/docker-compose.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
services:
44
dataportal-backend:
55
container_name: dataportal-backend
6-
image: ghcr.io/medizininformatik-initiative/feasibility-backend:latest
6+
image: ghcr.io/medizininformatik-initiative/feasibility-backend:pr-600
77
ports:
88
- "8090:8090"
99
depends_on:
@@ -27,6 +27,9 @@ services:
2727
DATABASE_USER: "dataportaluser"
2828
DATABASE_PASSWORD: "dataportalpw"
2929
DATABASE_DBNAME: "dataportal"
30+
ONTOLOGY_DB_MIGRATION_FOLDER: "/opt/ontology/migration"
31+
DSE_PROFILE_TREE_FILE: "/opt/ontology/dse/profile_tree.json"
32+
TERMINOLOGY_SYSTEMS_FILE: "/opt/ontology/terminology_systems.json"
3033
# ---- auth
3134
KEYCLOAK_ENABLED: "true"
3235
KEYCLOAK_ALLOWED_ROLE: "DataportalUser"
@@ -63,6 +66,7 @@ services:
6366
restart: unless-stopped
6467
volumes:
6568
- ./secrets:/opt/dataportal-security
69+
- ./ontology:/opt/ontology:ro
6670

6771
dataportal-postgres:
6872
image: 'postgres:16-alpine'
@@ -75,7 +79,7 @@ services:
7579
POSTGRES_DB: "dataportal"
7680

7781
dataportal-elastic:
78-
image: docker.elastic.co/elasticsearch/elasticsearch:9.0.2
82+
image: docker.elastic.co/elasticsearch/elasticsearch:9.1.3
7983
container_name: dataportal-elastic
8084
ports:
8185
- '9200:9200'
@@ -95,11 +99,15 @@ services:
9599
elastic-search-init:
96100
depends_on:
97101
- dataportal-elastic
98-
image: ghcr.io/medizininformatik-initiative/dataportal-es-init:1.2
99-
container_name: integration-test_elastic-search-init
102+
image: ghcr.io/medizininformatik-initiative/dataportal-es-init:latest
103+
container_name: elastic-search-init
100104
environment:
101105
ES_HOST: dataportal-elastic
102-
LOCAL_PATH: /tmp/mounted_onto.zip
106+
LOCAL_PATH: cypress/docker/ontology/elastic.zip
107+
ONTO_GIT_TAG: v3.9.0-experimental.0
108+
ONTO_REPO: https://github.com/medizininformatik-initiative/fhir-ontology-generator/releases/download
109+
DOWNLOAD_FILENAME: elastic.zip
110+
EXIT_ON_EXISTING_INDICES: false
103111
volumes:
104112
- type: bind
105113
source: "./ontology/elastic.zip"

0 commit comments

Comments
 (0)