Skip to content

Commit e6a88ea

Browse files
pgorrindopgorrindo
authored
manually bring 2test changes down to 1dev (#19)
* Create docker-compose-sdh.yml * add frontend config files per envt * Update default.conf.template * Update Dockerfile
1 parent 2c9c36c commit e6a88ea

File tree

7 files changed

+279
-2
lines changed

7 files changed

+279
-2
lines changed

‎docker-compose-sdh.yml‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SDH-specific implementation
2+
3+
name: sdh-openmrs-app-${ENVT}
4+
5+
services:
6+
gateway:
7+
image: openmrs/openmrs-reference-application-3-gateway:${TAG:-qa}
8+
restart: "unless-stopped"
9+
depends_on:
10+
- frontend
11+
- backend
12+
ports:
13+
- ${PORTS}
14+
15+
frontend:
16+
image: openmrs/openmrs-reference-application-3-frontend:${TAG:-qa}
17+
restart: "unless-stopped"
18+
environment:
19+
SPA_PATH: /openmrs/spa
20+
API_URL: /openmrs
21+
SPA_CONFIG_URLS: /openmrs/spa/config-core-sdh-${ENVT}.json
22+
SPA_DEFAULT_LOCALE:
23+
healthcheck:
24+
test: ["CMD", "curl", "-f", "http://localhost/"]
25+
timeout: 5s
26+
depends_on:
27+
- backend
28+
29+
backend:
30+
image: openmrs/openmrs-reference-application-3-backend:${TAG:-qa}
31+
restart: "unless-stopped"
32+
depends_on:
33+
- db
34+
environment:
35+
OMRS_CONFIG_MODULE_WEB_ADMIN: "true"
36+
OMRS_CONFIG_AUTO_UPDATE_DATABASE: "true"
37+
OMRS_CONFIG_CREATE_TABLES: "true"
38+
OMRS_CONFIG_CONNECTION_SERVER: db
39+
OMRS_CONFIG_CONNECTION_DATABASE: openmrs
40+
OMRS_CONFIG_CONNECTION_USERNAME: ${OPENMRS_DB_USER:-openmrs}
41+
OMRS_CONFIG_CONNECTION_PASSWORD: ${OPENMRS_DB_PASSWORD:-openmrs}
42+
healthcheck:
43+
test: ["CMD", "curl", "-f", "http://localhost:8080/openmrs"]
44+
timeout: 5s
45+
volumes:
46+
- openmrs-data:/openmrs/data
47+
48+
# MariaDB
49+
db:
50+
image: mariadb:10.11.7
51+
restart: "unless-stopped"
52+
command: "mysqld --character-set-server=utf8mb4 --collation-server=utf8mb4_general_ci"
53+
healthcheck:
54+
test: 'mysql --user=${OMRS_DB_USER:-openmrs} --password=${OMRS_DB_PASSWORD:-openmrs} --execute "SHOW DATABASES;"'
55+
interval: 3s
56+
timeout: 1s
57+
retries: 5
58+
environment:
59+
MYSQL_DATABASE: openmrs
60+
MYSQL_USER: ${OMRS_DB_USER:-openmrs}
61+
MYSQL_PASSWORD: ${OMRS_DB_PASSWORD:-openmrs}
62+
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-openmrs}
63+
volumes:
64+
- db-data:/var/lib/mysql
65+
66+
volumes:
67+
openmrs-data:
68+
name: sdh-openmrs-app-data-${ENVT}
69+
db-data:
70+
name: sdh-openmrs-db-data-${ENVT}

‎frontend/Dockerfile‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ FROM --platform=$BUILDPLATFORM node:18-alpine as dev
66

77
ARG APP_SHELL_VERSION=next
88

9+
ARG CONFIG_JSON_FILE
10+
911
RUN mkdir -p /app
1012
WORKDIR /app
1113

@@ -36,6 +38,7 @@ RUN chmod +x /usr/local/bin/startup.sh
3638
COPY nginx.conf /etc/nginx/nginx.conf
3739

3840
COPY --from=dev /app/spa /usr/share/nginx/html
39-
COPY config-core_demo.json /usr/share/nginx/html
41+
# COPY config-core_demo.json /usr/share/nginx/html
42+
COPY $CONFIG_JSON_FILE /usr/share/nginx/html
4043

4144
CMD ["/usr/local/bin/startup.sh"]

‎frontend/config-core-sdh-dev.json‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"@openmrs/esm-patient-chart-app": {
3+
"showUpcomingAppointments": true
4+
},
5+
"@openmrs/esm-service-queues-app": {
6+
"priorityConfigs": [
7+
{
8+
"conceptUuid": "04f6f7e0-e3cb-4e13-a133-4479f759574e",
9+
"tagClassName": "tag",
10+
"tagType": "red"
11+
}
12+
],
13+
"statusConfigs": [
14+
{
15+
"conceptUuid": "51ae5e4d-b72b-4912-bf31-a17efb690aeb",
16+
"iconComponent": "InProgress"
17+
},
18+
{
19+
"conceptUuid": "ca7494ae-437f-4fd0-8aae-b88b9a2ba47d",
20+
"iconComponent": "Group"
21+
},
22+
{
23+
"conceptUuid": "b559fb77-4e1e-4285-b9b7-1d03e0ba983f",
24+
"iconComponent": "Group"
25+
}
26+
],
27+
"concepts": {
28+
"defaultPriorityConceptUuid": "f4620bfa-3625-4883-bd3f-84c2cce14470",
29+
"emergencyPriorityConceptUuid": "04f6f7e0-e3cb-4e13-a133-4479f759574e",
30+
"defaultStatusConceptUuid": "51ae5e4d-b72b-4912-bf31-a17efb690aeb",
31+
"defaultTransitionStatus": "ca7494ae-437f-4fd0-8aae-b88b9a2ba47d"
32+
},
33+
"visitQueueNumberAttributeUuid": "",
34+
"defaultFacilityUrl": ""
35+
},
36+
"@openmrs/esm-styleguide": {
37+
"Brand color #1": "#2196F3",
38+
"Brand color #2": "#64B5F6",
39+
"Brand color #3": "#1976D2"
40+
},
41+
"@openmrs/esm-login-app": {
42+
"logo": {
43+
"src": "https://salcedodoctorshospital.org/assets/sdh-openmrs-logo-dev.png"
44+
}
45+
},
46+
"@openmrs/esm-primary-navigation-app": {
47+
"logo": {
48+
"src": "https://salcedodoctorshospital.org/assets/sdh-logo.png"
49+
}
50+
}
51+
}

‎frontend/config-core-sdh-prod.json‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"@openmrs/esm-patient-chart-app": {
3+
"showUpcomingAppointments": true
4+
},
5+
"@openmrs/esm-service-queues-app": {
6+
"priorityConfigs": [
7+
{
8+
"conceptUuid": "04f6f7e0-e3cb-4e13-a133-4479f759574e",
9+
"tagClassName": "tag",
10+
"tagType": "red"
11+
}
12+
],
13+
"statusConfigs": [
14+
{
15+
"conceptUuid": "51ae5e4d-b72b-4912-bf31-a17efb690aeb",
16+
"iconComponent": "InProgress"
17+
},
18+
{
19+
"conceptUuid": "ca7494ae-437f-4fd0-8aae-b88b9a2ba47d",
20+
"iconComponent": "Group"
21+
},
22+
{
23+
"conceptUuid": "b559fb77-4e1e-4285-b9b7-1d03e0ba983f",
24+
"iconComponent": "Group"
25+
}
26+
],
27+
"concepts": {
28+
"defaultPriorityConceptUuid": "f4620bfa-3625-4883-bd3f-84c2cce14470",
29+
"emergencyPriorityConceptUuid": "04f6f7e0-e3cb-4e13-a133-4479f759574e",
30+
"defaultStatusConceptUuid": "51ae5e4d-b72b-4912-bf31-a17efb690aeb",
31+
"defaultTransitionStatus": "ca7494ae-437f-4fd0-8aae-b88b9a2ba47d"
32+
},
33+
"visitQueueNumberAttributeUuid": "",
34+
"defaultFacilityUrl": ""
35+
},
36+
"@openmrs/esm-styleguide": {
37+
"Brand color #1": "#E91E63",
38+
"Brand color #2": "#F06292",
39+
"Brand color #3": "#C2185B"
40+
},
41+
"@openmrs/esm-login-app": {
42+
"logo": {
43+
"src": "https://salcedodoctorshospital.org/assets/sdh-openmrs-logo-prod.png"
44+
}
45+
},
46+
"@openmrs/esm-primary-navigation-app": {
47+
"logo": {
48+
"src": "https://salcedodoctorshospital.org/assets/sdh-logo.png"
49+
}
50+
}
51+
}

‎frontend/config-core-sdh-stage.json‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"@openmrs/esm-patient-chart-app": {
3+
"showUpcomingAppointments": true
4+
},
5+
"@openmrs/esm-service-queues-app": {
6+
"priorityConfigs": [
7+
{
8+
"conceptUuid": "04f6f7e0-e3cb-4e13-a133-4479f759574e",
9+
"tagClassName": "tag",
10+
"tagType": "red"
11+
}
12+
],
13+
"statusConfigs": [
14+
{
15+
"conceptUuid": "51ae5e4d-b72b-4912-bf31-a17efb690aeb",
16+
"iconComponent": "InProgress"
17+
},
18+
{
19+
"conceptUuid": "ca7494ae-437f-4fd0-8aae-b88b9a2ba47d",
20+
"iconComponent": "Group"
21+
},
22+
{
23+
"conceptUuid": "b559fb77-4e1e-4285-b9b7-1d03e0ba983f",
24+
"iconComponent": "Group"
25+
}
26+
],
27+
"concepts": {
28+
"defaultPriorityConceptUuid": "f4620bfa-3625-4883-bd3f-84c2cce14470",
29+
"emergencyPriorityConceptUuid": "04f6f7e0-e3cb-4e13-a133-4479f759574e",
30+
"defaultStatusConceptUuid": "51ae5e4d-b72b-4912-bf31-a17efb690aeb",
31+
"defaultTransitionStatus": "ca7494ae-437f-4fd0-8aae-b88b9a2ba47d"
32+
},
33+
"visitQueueNumberAttributeUuid": "",
34+
"defaultFacilityUrl": ""
35+
},
36+
"@openmrs/esm-styleguide": {
37+
"Brand color #1": "#4CAF50",
38+
"Brand color #2": "#81C784",
39+
"Brand color #3": "#388E3C"
40+
},
41+
"@openmrs/esm-login-app": {
42+
"logo": {
43+
"src": "https://salcedodoctorshospital.org/assets/sdh-openmrs-logo-stage.png"
44+
}
45+
},
46+
"@openmrs/esm-primary-navigation-app": {
47+
"logo": {
48+
"src": "https://salcedodoctorshospital.org/assets/sdh-logo.png"
49+
}
50+
}
51+
}

‎frontend/config-core-sdh-test.json‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
{
2+
"@openmrs/esm-patient-chart-app": {
3+
"showUpcomingAppointments": true
4+
},
5+
"@openmrs/esm-service-queues-app": {
6+
"priorityConfigs": [
7+
{
8+
"conceptUuid": "04f6f7e0-e3cb-4e13-a133-4479f759574e",
9+
"tagClassName": "tag",
10+
"tagType": "red"
11+
}
12+
],
13+
"statusConfigs": [
14+
{
15+
"conceptUuid": "51ae5e4d-b72b-4912-bf31-a17efb690aeb",
16+
"iconComponent": "InProgress"
17+
},
18+
{
19+
"conceptUuid": "ca7494ae-437f-4fd0-8aae-b88b9a2ba47d",
20+
"iconComponent": "Group"
21+
},
22+
{
23+
"conceptUuid": "b559fb77-4e1e-4285-b9b7-1d03e0ba983f",
24+
"iconComponent": "Group"
25+
}
26+
],
27+
"concepts": {
28+
"defaultPriorityConceptUuid": "f4620bfa-3625-4883-bd3f-84c2cce14470",
29+
"emergencyPriorityConceptUuid": "04f6f7e0-e3cb-4e13-a133-4479f759574e",
30+
"defaultStatusConceptUuid": "51ae5e4d-b72b-4912-bf31-a17efb690aeb",
31+
"defaultTransitionStatus": "ca7494ae-437f-4fd0-8aae-b88b9a2ba47d"
32+
},
33+
"visitQueueNumberAttributeUuid": "",
34+
"defaultFacilityUrl": ""
35+
},
36+
"@openmrs/esm-styleguide": {
37+
"Brand color #1": "#FFD53E",
38+
"Brand color #2": "#FFF75E",
39+
"Brand color #3": "#FDB833"
40+
},
41+
"@openmrs/esm-login-app": {
42+
"logo": {
43+
"src": "https://salcedodoctorshospital.org/assets/sdh-openmrs-logo-test.png"
44+
}
45+
},
46+
"@openmrs/esm-primary-navigation-app": {
47+
"logo": {
48+
"src": "https://salcedodoctorshospital.org/assets/sdh-logo.png"
49+
}
50+
}
51+
}

‎gateway/default.conf.template‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
map $request_uri $csp_header {
2-
default "default-src 'self' 'unsafe-inline' 'unsafe-eval' localhost localhost:*; base-uri 'self'; font-src 'self'; img-src 'self' data:; frame-ancestors 'self' ${FRAME_ANCESTORS};";
2+
default "default-src 'self' 'unsafe-inline' 'unsafe-eval' localhost localhost:*; base-uri 'self'; font-src 'self'; img-src *; frame-ancestors 'self' ${FRAME_ANCESTORS};";
33
"~^/openmrs/(?:admin|dictionary|module|patientDashboard.form)/" "default-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; base-uri 'self'; font-src 'self'; frame-ancestors 'self';";
44
"~^/openmrs/owa" "default-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline' 'unsafe-eval'; base-uri 'self'; font-src 'self' data:; img-src 'self' data:; frame-ancestors 'self';";
55
}

0 commit comments

Comments
 (0)