Skip to content

Commit

Permalink
Changed demo server versions to newest release
Browse files Browse the repository at this point in the history
  • Loading branch information
mkwiatkowskisoldevelo committed Dec 12, 2018
1 parent 22e74cc commit 4b19a48
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 15 deletions.
21 changes: 11 additions & 10 deletions deployment/demo_env/.env
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
OL_REFERENCE_UI_VERSION=5.1.1
OL_REFERENCE_UI_VERSION=5.1.2

OL_REQUISITION_VERSION=7.0.0
OL_REFERENCEDATA_VERSION=11.0.0
OL_AUTH_VERSION=4.0.0
OL_NOTIFICATION_VERSION=4.0.0
OL_FULFILLMENT_VERSION=7.0.1
OL_CCE_VERSION=1.0.1
OL_STOCKMANAGEMENT_VERSION=3.1.0
OL_REPORT_VERSION=1.1.1
OL_REQUISITION_VERSION=7.1.0
OL_REFERENCEDATA_VERSION=12.0.0
OL_AUTH_VERSION=4.1.0
OL_NOTIFICATION_VERSION=4.0.1
OL_FULFILLMENT_VERSION=8.0.0
OL_CCE_VERSION=1.0.2
OL_STOCKMANAGEMENT_VERSION=4.0.0
OL_REPORT_VERSION=1.1.2
OL_HAPIFHIR_VERSION=1.0.0

OL_DIAGNOSTICS_VERSION=1.0.1
OL_DIAGNOSTICS_VERSION=1.0.2

OL_NGINX_VERSION=4
OL_RSYSLOG_VERSION=1
18 changes: 13 additions & 5 deletions deployment/demo_env/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ services:
volumes:
- 'service-config:/config'
depends_on: [log]
command: ["/wait-for-postgres.sh", "/run.sh"]

referencedata:
restart: always
Expand All @@ -48,18 +49,20 @@ services:
volumes:
- 'service-config:/config'
depends_on: [log]
command: ["/wait-for-postgres.sh", "/run.sh"]

auth:
restart: always
image: openlmis/auth:${OL_AUTH_VERSION}
env_file: settings.env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
spring_profiles_active: ${spring_profiles_active}
volumes:
- 'service-config:/config'
- 'auth-tomcat-log:/var/log/auth-tomcat'
depends_on: [log]
command: ["/wait-for-postgres.sh", "/run.sh"]

notification:
restart: always
Expand All @@ -71,17 +74,19 @@ services:
volumes:
- 'service-config:/config'
depends_on: [log]
command: ["/wait-for-postgres.sh", "/run.sh"]

fulfillment:
restart: always
image: openlmis/fulfillment:${OL_FULFILLMENT_VERSION}
env_file: settings.env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
spring_profiles_active: ${spring_profiles_active}
volumes:
- 'service-config:/config'
depends_on: [log]
command: ["/wait-for-postgres.sh", "/run.sh"]

cce:
restart: always
Expand All @@ -93,29 +98,32 @@ services:
volumes:
- 'service-config:/config'
depends_on: [log]
command: ["/wait-for-postgres.sh", "/run.sh"]

stockmanagement:
restart: always
image: openlmis/stockmanagement:${OL_STOCKMANAGEMENT_VERSION}
env_file: settings.env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
spring_profiles_active: ${spring_profiles_active}
volumes:
- 'service-config:/config'
depends_on: [log]
command: ["/wait-for-postgres.sh", "/run.sh"]

report:
restart: always
image: openlmis/report:${OL_REPORT_VERSION}
env_file: settings.env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml -Dflyway.locations=classpath:db/migration,filesystem:/demo-data'
spring_profiles_active: ${spring_profiles_active}
volumes:
- 'service-config:/config'
depends_on: [log]

command: ["/wait-for-postgres.sh", "/run.sh"]

diagnostics:
restart: always
image: openlmis/diagnostics:${OL_DIAGNOSTICS_VERSION}
Expand Down

0 comments on commit 4b19a48

Please sign in to comment.