Skip to content

Commit 1479cf3

Browse files
committed
Bring in docker and ts configuration improvements from ltt deployment
1 parent 461fe6e commit 1479cf3

File tree

4 files changed

+28
-14
lines changed

4 files changed

+28
-14
lines changed

Dockerfile

+2-5
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,13 @@ ENV NODE_ENV production
77

88
WORKDIR /opt/app
99

10-
COPY package*.json ./
10+
COPY . .
1111
RUN npm clean-install --include=dev
1212

1313
RUN sed -i '/2\.11\.6/a \ \ "type": "module",' node_modules/@popperjs/core/package.json
1414

15-
COPY . .
1615
RUN npm run build
1716

18-
RUN cp -r build/ips/assets build/assets
19-
2017
RUN cp build/404.html build/index.html
2118

22-
CMD ["npm", "run", "start"]
19+
CMD ["sh", "-c", "npm run build && cp build/404.html build/index.html && npm run start"]

default.env

+21-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
# Default docker-compose environment file; copy to .env and modify as necessary
1+
# Default environment file; copy to .env and modify as necessary
2+
3+
###
4+
### docker-compose environment variables
5+
###
26
# `docker-compose` must be run in the same directory as this file
37
# https://docs.docker.com/compose/environment-variables/#the-env-file
48
# environmental variables for interpolation in docker-compose YAML files
@@ -11,28 +15,37 @@ COMPOSE_PROJECT_NAME=
1115
# Port to expose to internet; use in SERVER_NAME (portal.env)
1216
# EXTERNAL_PORT=
1317

18+
# Enable to use development overrides
19+
# COMPOSE_FILE=docker-compose.yaml:docker-compose.dev.yaml
20+
1421
# Enable to use dynamic ingress overrides
1522
# COMPOSE_FILE=docker-compose.yaml:docker-compose.traefik-ingress.yaml
1623

1724
# Enable to use static ingress overrides
1825
COMPOSE_FILE=docker-compose.yaml:docker-compose.static-ingress.yaml
1926

20-
# Fully qualified domain name; used to configure ingress
27+
# Fully qualified domain name; used to configure traefik ingress
2128
# SERVER_NAME=foo.cirg.uw.edu
2229

23-
# Enable to use development overrides
24-
# COMPOSE_FILE=docker-compose.yaml:docker-compose.dev.yaml
30+
###
31+
### Client environment variables:
32+
### Variables with VITE_ prefix will be available to the client
33+
###
2534

26-
VITE_EPIC_HIMSS_CLIENT_ID=
27-
VITE_ECW_HIMSS_CLIENT_ID=
35+
# SMART on FHIR client id configurations
36+
# Ensure that your development client is registered with the proper redirect uris
2837
VITE_EPIC_CLIENT_ID=
2938
VITE_CERNER_CLIENT_ID=
3039

40+
# HIMSS 2024 only:
41+
#VITE_EPIC_HIMSS_CLIENT_ID=
42+
#VITE_ECW_HIMSS_CLIENT_ID=
43+
3144
# SHL Server API endpoint url
3245
VITE_API_BASE=
3346

34-
# SHL Viewer url
35-
VITE_VIEWER_BASE=
47+
# SHL Viewer url override
48+
#VITE_VIEWER_BASE=
3649

3750
# FHIR Server endpoint url
3851
VITE_INTERMEDIATE_FHIR_SERVER_BASE=

docker-compose.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,6 @@
22
version: "3.4"
33
services:
44
shlips:
5-
build: ./
5+
build: ./
6+
env_file:
7+
- .env

tsconfig.json

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
"lib": ["es2022"],
1818
// "outDir": "dist",
1919
"sourceMap": true,
20+
"suppressImplicitAnyIndexErrors": true,
21+
"ignoreDeprecations": "5.0",
2022
}
2123
// Path aliases are handled by https://kit.svelte.dev/docs/configuration#alias
2224
//

0 commit comments

Comments
 (0)