Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FI-3076: Add FHIRPath Service to Template #532

Merged
merged 4 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ VALIDATOR_URL=http://localhost/validatorapi
REDIS_URL=redis://localhost:6379/0
G10_VALIDATOR_URL=http://localhost/validatorapi
FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
FHIRPATH_URL=http://localhost:6789
FHIRPATH_URL=http://localhost/fhirpath

# The base path where inferno will be hosted. Leave blank to host inferno at the
# root of its host.
Expand Down
15 changes: 15 additions & 0 deletions config/nginx.background.conf
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,20 @@ http {

proxy_pass http://hl7_validator_service:3500/;
}

location /fhirpath/ {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Port $server_port;
proxy_redirect off;
proxy_set_header Connection '';
proxy_http_version 1.1;
chunked_transfer_encoding off;
proxy_buffering off;
proxy_cache off;

proxy_pass http://fhirpath:6789/;
}
}
}
1 change: 1 addition & 0 deletions docker-compose.background.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ services:
command: [nginx, '-g', 'daemon off;']
depends_on:
- fhir_validator_app
- fhirpath
redis:
image: redis
ports:
Expand Down
3 changes: 2 additions & 1 deletion lib/inferno/apps/cli/templates/.env.development
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FHIR_RESOURCE_VALIDATOR_URL=http://localhost/hl7validatorapi
REDIS_URL=redis://localhost:6379/0
REDIS_URL=redis://localhost:6379/0
FHIRPATH_URL=http://localhost/fhirpath
3 changes: 2 additions & 1 deletion lib/inferno/apps/cli/templates/.env.production
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
REDIS_URL=redis://redis:6379/0
FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
FHIR_RESOURCE_VALIDATOR_URL=http://hl7_validator_service:3500
FHIRPATH_URL=http://fhirpath:6789
1 change: 1 addition & 0 deletions lib/inferno/apps/cli/templates/.env.test
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
FHIR_RESOURCE_VALIDATOR_URL=https://example.com/validatorapi
ASYNC_JOBS=false
FHIRPATH_URL=https://example.com/fhirpath
15 changes: 15 additions & 0 deletions lib/inferno/apps/cli/templates/config/nginx.background.conf.tt
Original file line number Diff line number Diff line change
Expand Up @@ -98,5 +98,20 @@ http {

proxy_pass http://hl7_validator_service:3500/;
}

location /fhirpath/ {
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
proxy_set_header Host $http_host;
proxy_set_header X-Forwarded-Proto $scheme;
proxy_set_header X-Forwarded-Port $server_port;
proxy_redirect off;
proxy_set_header Connection '';
proxy_http_version 1.1;
chunked_transfer_encoding off;
proxy_buffering off;
proxy_cache off;

proxy_pass http://fhirpath:6789/;
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ services:
environment:
EXTERNAL_VALIDATOR_URL: http://localhost/validatorapi
VALIDATOR_BASE_PATH: /validator
fhirpath:
image: infernocommunity/fhirpath-service
ports:
- "6789:6789"
nginx:
image: nginx
volumes:
Expand All @@ -32,6 +36,7 @@ services:
command: [nginx, '-g', 'daemon off;']
depends_on:
- fhir_validator_app
- fhirpath
redis:
image: redis
ports:
Expand Down
4 changes: 4 additions & 0 deletions lib/inferno/apps/cli/templates/docker-compose.yml.tt
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ services:
extends:
file: docker-compose.background.yml
service: fhir_validator_app
fhirpath:
extends:
file: docker-compose.background.yml
service: fhirpath
nginx:
extends:
file: docker-compose.background.yml
Expand Down
Loading