Skip to content

Commit 4b19a48

Browse files
Changed demo server versions to newest release
1 parent 22e74cc commit 4b19a48

File tree

2 files changed

+24
-15
lines changed

2 files changed

+24
-15
lines changed

deployment/demo_env/.env

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
OL_REFERENCE_UI_VERSION=5.1.1
1+
OL_REFERENCE_UI_VERSION=5.1.2
22

3-
OL_REQUISITION_VERSION=7.0.0
4-
OL_REFERENCEDATA_VERSION=11.0.0
5-
OL_AUTH_VERSION=4.0.0
6-
OL_NOTIFICATION_VERSION=4.0.0
7-
OL_FULFILLMENT_VERSION=7.0.1
8-
OL_CCE_VERSION=1.0.1
9-
OL_STOCKMANAGEMENT_VERSION=3.1.0
10-
OL_REPORT_VERSION=1.1.1
3+
OL_REQUISITION_VERSION=7.1.0
4+
OL_REFERENCEDATA_VERSION=12.0.0
5+
OL_AUTH_VERSION=4.1.0
6+
OL_NOTIFICATION_VERSION=4.0.1
7+
OL_FULFILLMENT_VERSION=8.0.0
8+
OL_CCE_VERSION=1.0.2
9+
OL_STOCKMANAGEMENT_VERSION=4.0.0
10+
OL_REPORT_VERSION=1.1.2
11+
OL_HAPIFHIR_VERSION=1.0.0
1112

12-
OL_DIAGNOSTICS_VERSION=1.0.1
13+
OL_DIAGNOSTICS_VERSION=1.0.2
1314

1415
OL_NGINX_VERSION=4
1516
OL_RSYSLOG_VERSION=1

deployment/demo_env/docker-compose.yml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ services:
3737
volumes:
3838
- 'service-config:/config'
3939
depends_on: [log]
40+
command: ["/wait-for-postgres.sh", "/run.sh"]
4041

4142
referencedata:
4243
restart: always
@@ -48,18 +49,20 @@ services:
4849
volumes:
4950
- 'service-config:/config'
5051
depends_on: [log]
52+
command: ["/wait-for-postgres.sh", "/run.sh"]
5153

5254
auth:
5355
restart: always
5456
image: openlmis/auth:${OL_AUTH_VERSION}
5557
env_file: settings.env
5658
environment:
57-
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
59+
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
5860
spring_profiles_active: ${spring_profiles_active}
5961
volumes:
6062
- 'service-config:/config'
6163
- 'auth-tomcat-log:/var/log/auth-tomcat'
6264
depends_on: [log]
65+
command: ["/wait-for-postgres.sh", "/run.sh"]
6366

6467
notification:
6568
restart: always
@@ -71,17 +74,19 @@ services:
7174
volumes:
7275
- 'service-config:/config'
7376
depends_on: [log]
77+
command: ["/wait-for-postgres.sh", "/run.sh"]
7478

7579
fulfillment:
7680
restart: always
7781
image: openlmis/fulfillment:${OL_FULFILLMENT_VERSION}
7882
env_file: settings.env
7983
environment:
80-
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
84+
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
8185
spring_profiles_active: ${spring_profiles_active}
8286
volumes:
8387
- 'service-config:/config'
8488
depends_on: [log]
89+
command: ["/wait-for-postgres.sh", "/run.sh"]
8590

8691
cce:
8792
restart: always
@@ -93,29 +98,32 @@ services:
9398
volumes:
9499
- 'service-config:/config'
95100
depends_on: [log]
101+
command: ["/wait-for-postgres.sh", "/run.sh"]
96102

97103
stockmanagement:
98104
restart: always
99105
image: openlmis/stockmanagement:${OL_STOCKMANAGEMENT_VERSION}
100106
env_file: settings.env
101107
environment:
102-
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
108+
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
103109
spring_profiles_active: ${spring_profiles_active}
104110
volumes:
105111
- 'service-config:/config'
106112
depends_on: [log]
113+
command: ["/wait-for-postgres.sh", "/run.sh"]
107114

108115
report:
109116
restart: always
110117
image: openlmis/report:${OL_REPORT_VERSION}
111118
env_file: settings.env
112119
environment:
113-
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
120+
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
114121
spring_profiles_active: ${spring_profiles_active}
115122
volumes:
116123
- 'service-config:/config'
117124
depends_on: [log]
118-
125+
command: ["/wait-for-postgres.sh", "/run.sh"]
126+
119127
diagnostics:
120128
restart: always
121129
image: openlmis/diagnostics:${OL_DIAGNOSTICS_VERSION}

0 commit comments

Comments
 (0)