Skip to content

Commit

Permalink
fix (#18)
Browse files Browse the repository at this point in the history
  • Loading branch information
HerbertYiga authored Oct 11, 2022
1 parent 405fc9d commit 54586c9
Show file tree
Hide file tree
Showing 5 changed files with 56 additions and 12 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
# This is a basic workflow to help you get started with Actions

name: CI
# Controls when the action will run.
on:
Expand Down Expand Up @@ -65,4 +64,4 @@ jobs:
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
cache-from: type=inline,ref=user/app:buildcache
cache-to: type=inline,ref=user/app:buildcache,mode=max
cache-to: type=inline,ref=user/app:buildcache,mode=max
8 changes: 2 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,11 @@ ADD pom.xml ./
ADD src/main/resources ./src/main/resources

RUN mvn verify --fail-never


ADD src ./src

RUN mvn clean package -DskipTests
RUN mvn -DskipTests clean package

FROM openjdk:8-jdk as run

COPY --from=build /app/target/mediator-xds-1.0.3-jar-with-dependencies.jar /mediator-xds-1.0.3-jar-with-dependencies.jar
COPY --from=build /app/src/main/resources/mediator.properties /mediator.properties

ENTRYPOINT java -jar /mediator-xds-1.0.3-jar-with-dependencies.jar --conf /mediator.properties
ENTRYPOINT java -jar /mediator-xds-1.0.3-jar-with-dependencies.jar --conf /mediator.properties
3 changes: 3 additions & 0 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ services:
container_name: xds-mediator
hostname: xds-mediator
image: xds-mediator:latest
ports:
- "8050:8050"
- "1044:1044"
volumes:
#data is the directory which you want to persist the generated parquet files
- ../data:/tmp
46 changes: 46 additions & 0 deletions src/main/resources/mediator-registration-info.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
{
"urn": "urn:mediator:xds",
"version": "1.0.0",
"name": "OpenHIE XDS.b Mediator",
"description": "An XDS.b mediator for OpenHIE integration",
"endpoints": [
{
"name": "XDS.b Mediator",
"host": "localhost",
"port": "8500",
"type": "http"
}
],
"defaultChannelConfig": [
{
"name": "XDS.b Mediator",
"urlPattern": "^/xds(registry|repository|brepository)$",
"type": "http",
"allow": ["xds,lnsp,xdsRole"],
"routes": [
{
"name": "XDS.b Mediator",
"host": "localhost",
"port": "8500",
"type": "http",
"primary": "true"
}
]
},
{
"name": "XDS.b Mediator dsub",
"urlPattern": "^/dsub$",
"type": "http",
"allow": ["xds"],
"routes": [
{
"name": "XDS.b Mediator - DSUB",
"host": "localhost",
"port": "8500",
"type": "http",
"primary": "true"
}
]
}
]
}
8 changes: 4 additions & 4 deletions src/main/resources/mediator.properties
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ mediator.name=xds-mediator
mediator.host=0.0.0.0
mediator.port=8500
mediator.timeout=60000
mediator.mongo.host=mongodb
mediator.mongo.host=mongo-db
mediator.mongo.port=27017

core.host=localhost
core.api.port=8080
core.host=openhim-api.sedish-haiti.org
core.api.port=443
core.api.user=root@openhim.org
core.api.password=openhim-password
core.api.password=openhim

# Assigning authorities to resolve to during transaction enrichment
client.requestedAssigningAuthority=http://openclientregistry.org/fhir/sourceid
Expand Down

0 comments on commit 54586c9

Please sign in to comment.