Skip to content

Commit

Permalink
Revert "Merge branch 'master' of github.com:OpenLMIS/openlmis-ref-dis…
Browse files Browse the repository at this point in the history
…tro"

This reverts commit 7a25610, reversing
changes made to a70e3bc.
  • Loading branch information
eliasmu committed May 18, 2021
1 parent 7a25610 commit 18ee84f
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 48 deletions.
3 changes: 0 additions & 3 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,3 @@ OL_NGINX_VERSION=5
OL_RSYSLOG_VERSION=1

OL_POSTGRES_VERSION=9.6-debezium
TZ_UI_VERSION=1.0.0-SNAPSHOT
OL_EQUIPMENT_VERSION=1.0.0-SNAPSHOT
TZ_COMMON_VERSION=1.0.0-SNAPSHOT
42 changes: 3 additions & 39 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ services:
- 'consul-template-log:/var/log/consul-template'
depends_on: [consul]

tanzania-ui:
image: openlmistz/tanzania-ui:${TZ_UI_VERSION}
reference-ui:
image: openlmis/reference-ui:${OL_REFERENCE_UI_VERSION}
env_file: settings.env
depends_on: [ consul ]
depends_on: [consul]

requisition:
image: openlmis/requisition:${OL_REQUISITION_VERSION}
Expand Down Expand Up @@ -77,42 +77,6 @@ services:
depends_on: [log, db]
command: ["/wait-for-postgres.sh", "/run.sh"]

budget:
restart: always
image: openlmistz/budget:latest
env_file: settings.env
environment:
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" ]

equipment:
restart: always
image: openlmistz/equipment:${OL_EQUIPMENT_VERSION}
env_file: settings.env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
spring_profiles_active: ${spring_profiles_active}
volumes:
- 'service-config:/config'
depends_on: [ log, cce ]
command: [ "/wait-for-postgres.sh", "/run.sh" ]

common:
restart: always
image: openlmistz/common:${TZ_COMMON_VERSION}
env_file: settings.env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
spring_profiles_active: ${spring_profiles_active}
volumes:
- 'service-config:/config'
depends_on: [ log, db ]
command: [ "/wait-for-postgres.sh", "/run.sh" ]

cce:
image: openlmis/cce:${OL_CCE_VERSION}
env_file: settings.env
Expand Down
6 changes: 0 additions & 6 deletions docs/testuml.md

This file was deleted.

0 comments on commit 18ee84f

Please sign in to comment.