Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

eLMIS #144

Open
wants to merge 34 commits into
base: master
Choose a base branch
from
Open

eLMIS #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
b0c64ce
update ip configs
khobatha Oct 27, 2023
42211bf
new compose file for an example extension
khobatha Oct 27, 2023
097d456
rename
khobatha Oct 27, 2023
ed0d01d
include template-service during spin
khobatha Oct 27, 2023
9496389
remove template-service during spin
khobatha Oct 27, 2023
9facda2
template-service
khobatha Oct 27, 2023
ece3ef5
include example-extensions
khobatha Oct 27, 2023
c1b6878
new compose file for new service
khobatha Oct 30, 2023
091f89b
update env_file for example service
khobatha Oct 30, 2023
24ea928
use latest example-extension service
khobatha Oct 30, 2023
a392791
recreate by replicating std compose file
khobatha Oct 30, 2023
eff4e19
create new compose file to test pod init service
khobatha Oct 31, 2023
2930a95
specify correct pod image name
khobatha Oct 31, 2023
981543f
update pod service java and volume configs
khobatha Nov 3, 2023
fa2308f
use the raw template service
khobatha Nov 3, 2023
fbdd375
rename pod to template-service
khobatha Nov 3, 2023
0767647
new dev compose file
lmphatsi Nov 8, 2023
c52b803
Production compose file
lmphatsi Dec 21, 2023
5de86d7
bump up pointofdelivery and stockmanagement versions
lmphatsi Jan 18, 2024
877c5ad
auto evolve connector schema
lmphatsi Feb 6, 2024
34aa923
SUPERSET_URL in settings-sample.env
Lethusang Feb 17, 2024
914acce
SUPERSET_URL in settings-sample.env
Lethusang Feb 17, 2024
db8ef2b
Update to Superset Dockerfile
Lethusang Feb 17, 2024
7236132
Update to superset Documentation
Lethusang Feb 17, 2024
022220f
Include prepacking service
khobatha Apr 16, 2024
07c4b17
add dispensing service
lmphatsi Apr 17, 2024
f8c69df
add dispensing service version
lmphatsi Apr 17, 2024
9c82fb7
Add Changes
MohauNkepane Oct 24, 2024
73ce368
05122024
eLMIS-Lesotho Dec 5, 2024
74515ab
05122024-2
eLMIS-Lesotho Dec 5, 2024
c12e1d9
Add Vitals Button
eLMIS-Lesotho Dec 19, 2024
b6a7c1c
Merge pull request #1 from Lesotho-eLMIS/dev_local
MohauNkepane Jan 21, 2025
0fb077c
disable dispesing and prepacking backend services
lmphatsi Jan 21, 2025
4294b02
Add New UI Without Dispensing and Prepacking
eLMIS-Lesotho Jan 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions .env
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
OL_REFERENCE_UI_VERSION=5.2.7-SNAPSHOT

OL_REQUISITION_VERSION=8.3.7-SNAPSHOT
OL_REFERENCEDATA_VERSION=15.2.6-SNAPSHOT
OL_AUTH_VERSION=4.3.4-SNAPSHOT
OL_NOTIFICATION_VERSION=4.3.4-SNAPSHOT
OL_FULFILLMENT_VERSION=9.0.5-SNAPSHOT
OL_REFERENCE_UI_VERSION=1.4.1
#OL_REQUISITION_VERSION=8.3.7-SNAPSHOT
OL_REQUISITION_VERSION=1.0.7
OL_REFERENCEDATA_VERSION=1.0.1
OL_AUTH_VERSION=0.0.1
OL_NOTIFICATION_VERSION=1.0.7
#OL_FULFILLMENT_VERSION=9.0.5-SNAPSHOT
OL_FULFILLMENT_VERSION=1.0.0
OL_CCE_VERSION=1.3.3-SNAPSHOT
OL_STOCKMANAGEMENT_VERSION=5.1.10-SNAPSHOT
OL_STOCKMANAGEMENT_VERSION=1.1.6
#curr stock 1.1.4
OL_PREPACKING_VERSION=1.0.9
#OL_PREPACKING_VERSION=latest
OL_DISPENSING_VERSION=1.1.1
#OL_STOCKMANAGEMENT_VERSION=latest
#OL_POINTOFDELIVERY_VERSION=1.0.1
OL_POINTOFDELIVERY_VERSION=1.0.6
OL_INVENTORYMANAGEMENT_VERSION=latest
OL_REPORT_VERSION=1.2.3-SNAPSHOT
OL_BUQ_VERSION=1.0.0-SNAPSHOT
OL_HAPIFHIR_VERSION=2.0.3-SNAPSHOT
Expand All @@ -16,7 +25,8 @@ OL_ONE_NETWORK_INTEGRATION_STOCKMANAGEMENT_EXTENSION_VERSION=0.0.1

OL_DIAGNOSTICS_VERSION=1.1.3-SNAPSHOT

OL_NGINX_VERSION=5
#OL_NGINX_VERSION=5
OL_NGINX_VERSION=1.0.0
OL_RSYSLOG_VERSION=1

OL_POSTGRES_VERSION=12-debezium
OL_POSTGRES_VERSION=12-debezium
260 changes: 260 additions & 0 deletions docker-compose.openlmis-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,260 @@
version: "3.3"
services:

consul:
command: -server -bootstrap
image: gliderlabs/consul-server
ports:
- "8300"
- "8400"
- "8500:8500"
- "53"

nginx:
#image: openlmis/nginx:${OL_NGINX_VERSION}
image: elmislesotho/nginx:${OL_NGINX_VERSION}
ports:
- "${OL_HTTP_PORT:-80}:80"
env_file: settings.env
environment:
NGINX_LOG_DIR: '/var/log/nginx/log'
NGINX_TIMEOUT: '300s'
volumes:
- 'nginx-log:/var/log/nginx/log'
- 'consul-template-log:/var/log/consul-template'
depends_on: [consul]

reference-ui:
image: elmislesotho/reference-ui:${OL_REFERENCE_UI_VERSION}
env_file: settings.env
depends_on: [consul]

requisition:
image: elmislesotho/requisition:${OL_REQUISITION_VERSION}
env_file: settings.env
environment:
#JAVA_OPTS: '-server -Xmx1024m -Dlogging.config=/config/log/logback.xml'
JAVA_OPTS: >
-server
-Xms1024m
-Xmx3072m
-XX:+UseG1GC
-XX:MetaspaceSize=128m
-XX:MaxMetaspaceSize=256m
-Xss512k
-XX:+PrintGCDetails
-XX:+PrintGCDateStamps
-Xloggc:/var/log/requisition/gc.log
-Dlogging.config=/config/log/logback.xml
volumes:
- 'service-config:/config'
depends_on: [log, db]
command: ["/wait-for-postgres.sh", "/run.sh"]

referencedata:
image: elmislesotho/referencedata:${OL_REFERENCEDATA_VERSION}
env_file: settings.env
environment:
#JAVA_OPTS: '-server -Xmx1024m -Dlogging.config=/config/log/logback.xml'
JAVA_OPTS: >
-server
-Xms1024m
-Xmx3072m
-XX:+UseG1GC
-XX:MetaspaceSize=128m
-XX:MaxMetaspaceSize=256m
-Xss512k
-XX:+PrintGCDetails
-XX:+PrintGCDateStamps
-Xloggc:/var/log/referencedata/gc.log
-Dlogging.config=/config/log/logback.xml
volumes:
- 'service-config:/config'
depends_on: [log, db]
command: ["/wait-for-postgres.sh", "/run.sh"]

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

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

fulfillment:
image: elmislesotho/fulfillment:${OL_FULFILLMENT_VERSION}
env_file: settings.env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
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
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
volumes:
- 'service-config:/config'
depends_on: [log, db]
command: ["/wait-for-postgres.sh", "/run.sh"]

stockmanagement:
image: elmislesotho/stockmanagement:${OL_STOCKMANAGEMENT_VERSION}
env_file: settings.env
environment:
#JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
JAVA_OPTS: >
-server
-Xms1024m
-Xmx3072m
-XX:+UseG1GC
-XX:MetaspaceSize=128m
-XX:MaxMetaspaceSize=256m
-Xss512k
-XX:+PrintGCDetails
-XX:+PrintGCDateStamps
-Xloggc:/var/log/stockmanagement/gc.log
-Dlogging.config=/config/log/logback.xml
volumes:
- 'service-config:/config'
depends_on: [log, db]
command: ["/wait-for-postgres.sh", "/run.sh"]

# prepacking:
# image: elmislesotho/prepacking:${OL_PREPACKING_VERSION}
# env_file: settings.env
# environment:
# JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
# volumes:
# - 'service-config:/config'
# depends_on: [log, db]
# command: ["/wait-for-postgres.sh", "/run.sh"]

# dispensing:
# image: elmislesotho/dispensing:${OL_DISPENSING_VERSION}
# env_file: settings.env
# environment:
# JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
# volumes:
# - 'service-config:/config'
# depends_on: [log, db]
# command: ["/wait-for-postgres.sh", "/run.sh"]

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

buq:
image: openlmis/buq:${OL_BUQ_VERSION}
env_file: settings.env
environment:
JAVA_OPTS: '-server -Xmx1024m -Dlogging.config=/config/log/logback.xml'
volumes:
- 'service-config:/config'
depends_on: [ log, db ]
command: [ "/wait-for-postgres.sh", "/run.sh" ]

hapifhir:
restart: always
image: openlmis/hapifhir:${OL_HAPIFHIR_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"]

diagnostics:
image: openlmis/diagnostics:${OL_DIAGNOSTICS_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:
image: openlmis/postgres:${OL_POSTGRES_VERSION}
env_file: settings.env
networks:
default:
aliases:
- olmis-db
depends_on: [consul]

log:
image: openlmis/rsyslog:${OL_RSYSLOG_VERSION}
volumes:
- 'syslog:/var/log'
depends_on:
- service-configuration
- consul

service-configuration:
build:
context: ./config
volumes:
- service-config:/config

ftp:
image: hauptmedia/proftpd
ports:
- "${OL_FTP_PORT_21:-21}:21"
- "${OL_FTP_PORT_20:-20}:20"
env_file: settings.env
depends_on: [consul]

redis:
image: redis:3.2.12
depends_on: [consul]

pointofdelivery:
image: elmislesotho/pointofdelivery:${OL_POINTOFDELIVERY_VERSION}
env_file: settings.env
environment:
JAVA_OPTS: '-server -Xmx512m -Dlogging.config=/config/log/logback.xml'
volumes:
- 'pointofdelivery-extensions:/extensions'
- 'service-config:/config'
depends_on: [log, db]

# example-extensions:
# image: openlmis/openlmis-example-extensions:latest
# volumes:
# - 'example-extensions:/extensions'

volumes:
syslog:
external: false
nginx-log:
external: false
consul-template-log:
external: false
service-config:
external: false
pointofdelivery-extensions:
external: false
Loading