Skip to content

Commit a07b4ed

Browse files
authored
Merge pull request DIGI-UW#2034 from mozzy11/develop
minor updates
2 parents 90f6065 + d0a1409 commit a07b4ed

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

dev.docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
certs:
44
container_name: oe-certs
55
image: itechuw/certgen:main
6-
# platform: linux/amd64
6+
platform: linux/amd64
77
restart: always
88
environment:
99
- KEYSTORE_PW="kspass"
@@ -42,7 +42,7 @@ services:
4242
# context: .
4343
# dockerfile: Dockerfile.dev
4444
image: itechuw/openelis-global-2-dev:develop
45-
# platform: linux/amd64
45+
platform: linux/amd64
4646
depends_on:
4747
- database
4848
- certs
@@ -75,7 +75,7 @@ services:
7575
fhir.openelis.org:
7676
container_name: external-fhir-api
7777
image: itechuw/openelis-global-2-fhir:develop
78-
# platform: linux/amd64
78+
platform: linux/amd64
7979
depends_on:
8080
- database
8181
- certs
@@ -106,7 +106,7 @@ services:
106106
frontend.openelis.org:
107107
image: itechuw/openelis-global-2-frontend-dev:develop
108108
container_name: openelisglobal-front-end
109-
# platform: linux/amd64
109+
platform: linux/amd64
110110
networks:
111111
- default
112112
volumes:
@@ -119,7 +119,7 @@ services:
119119
proxy:
120120
image: itechuw/openelis-global-2-proxy:develop
121121
container_name: openelisglobal-proxy
122-
# platform: linux/amd64
122+
platform: linux/amd64
123123
ports:
124124
- 80:80
125125
- 443:443

docker-compose.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ services:
33
certs:
44
container_name: oe-certs
55
image: itechuw/certgen:main
6-
# platform: linux/amd64
6+
platform: linux/amd64
77
restart: always
88
environment:
99
- KEYSTORE_PW="kspass"
@@ -39,7 +39,7 @@ services:
3939
oe.openelis.org:
4040
container_name: openelisglobal-webapp
4141
image: itechuw/openelis-global-2:develop
42-
# platform: linux/amd64
42+
platform: linux/amd64
4343
depends_on:
4444
- database
4545
- certs
@@ -72,7 +72,7 @@ services:
7272
fhir.openelis.org:
7373
container_name: external-fhir-api
7474
image: itechuw/openelis-global-2-fhir:develop
75-
# platform: linux/amd64
75+
platform: linux/amd64
7676
depends_on:
7777
- database
7878
- certs
@@ -104,7 +104,7 @@ services:
104104
frontend.openelis.org:
105105
image: itechuw/openelis-global-2-frontend:develop
106106
container_name: openelisglobal-front-end
107-
# platform: linux/amd64
107+
platform: linux/amd64
108108
networks:
109109
- default
110110
environment:
@@ -114,7 +114,7 @@ services:
114114
proxy:
115115
image: itechuw/openelis-global-2-proxy:develop
116116
container_name: openelisglobal-proxy
117-
# platform: linux/amd64
117+
platform: linux/amd64
118118
ports:
119119
- 80:80
120120
- 443:443

frontend/src/components/admin/testManagementConfigMenu/PanelTestAssign.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ let breadcrumbs = [
5050
},
5151
{
5252
label: "configuration.panel.manage",
53-
link: "/MasterListsPage#SampleTypeManagement",
53+
link: "/MasterListsPage#PanelManagement",
5454
},
5555
{
5656
label: "configuration.panel.assign",

frontend/src/components/admin/testManagementConfigMenu/TestSectionManagement.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ function TestSectionManagement() {
8989
id="TestSectionCreate"
9090
href="/MasterListsPage#TestSectionCreate"
9191
>
92-
<FormattedMessage id="configuration.method.create" />
92+
<FormattedMessage id="configuration.testUnit.create" />
9393
</ClickableTile>
9494
<br />
9595
<ClickableTile

0 commit comments

Comments
 (0)