Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
102 commits
Select commit Hold shift + click to select a range
15b1f96
initial commit
antoine-brun Nov 23, 2021
6d58429
update tag
antoine-brun Nov 29, 2021
29046f8
Update install.sh
ArnaudFosse Dec 8, 2021
9c03a07
Update install.sh
ArnaudFosse Dec 8, 2021
c344c72
Update install_win.sh
ArnaudFosse Dec 8, 2021
2c1ed20
Update install_win.sh
ArnaudFosse Dec 8, 2021
e3d80cb
MSA-10567 : Add msa_bulkfiles volume to msa-sms
UBiqube-ydu Dec 17, 2021
3270ad7
Merge pull request #132 from ubiqube/2.7.0_MSA-10567_ydu
UBiqube-ydu Dec 17, 2021
ea068a2
MSA-9893 - Replace script fix swarm
efeubiqube Dec 1, 2021
d7933b2
Merge pull request #130 from ubiqube/MSA-9893
efeubiqube Dec 29, 2021
764995f
Update install_libraries.sh
ArnaudFosse Jan 17, 2022
c1ee519
Style: replace tab -> spaces
efeubiqube Nov 2, 2021
2c61f08
update tag
antoine-brun Nov 5, 2021
76f25d5
update tag
antoine-brun Nov 5, 2021
f2bfa6b
MSA-10578 - Fix: wrong version, logic and typo
efeubiqube Nov 8, 2021
85e42bc
merge from master
antoine-brun Jan 18, 2022
7695444
Update docker-compose.simple.ha.yml
speUbiqube Jan 18, 2022
b03fc2c
merge from 2.7
antoine-brun Jan 18, 2022
4248f41
merge from 2.7
antoine-brun Jan 18, 2022
2f9cb3d
deactivate checkComposeVersion
antoine-brun Jan 18, 2022
20739af
Update install.sh
ArnaudFosse Jan 18, 2022
870851b
rename dir
antoine-brun Jan 18, 2022
a52b90a
rename dir
antoine-brun Jan 18, 2022
3b6f22b
update sample
antoine-brun Jan 18, 2022
eda8f67
update docker images
antoine-brun Jan 18, 2022
e83113c
update tag
antoine-brun Jan 18, 2022
f056f8b
Merge branch 'master' into 2.7.0
abr-ubiqube Jan 18, 2022
712c605
merge
nc-nb-gn-sdn-dev-msa Jan 18, 2022
490eef5
merge 2.7.0
antoine-brun Jan 18, 2022
8e96c04
merge
nc-nb-gn-sdn-dev-msa Jan 18, 2022
7a078f8
update sample
antoine-brun Jan 18, 2022
41dd214
Merge branch 'nginx_based_emulator' of https://github.com/ubiqube/qui…
antoine-brun Jan 18, 2022
c5a756c
Update docker-compose.yml
speUbiqube Mar 14, 2022
cbb9370
Update install.sh
ArnaudFosse Mar 14, 2022
c798bb6
Update install_win.sh
ArnaudFosse Mar 14, 2022
8c7979e
fix db volume/params
nc-nb-gn-sdn-dev-msa Mar 14, 2022
a13f33b
On the new image, that line is not needed
efeubiqube Mar 14, 2022
ee5db11
Update DB images and params
efeubiqube Mar 14, 2022
9c5fea4
Update docker-compose.ha.yml
ArnaudFosse Mar 15, 2022
e9d3732
Option no supported
efeubiqube Mar 15, 2022
b47a378
Update docker-compose.ha.yml
ArnaudFosse Mar 15, 2022
fadf210
update tags
nc-nb-gn-sdn-dev-msa Mar 17, 2022
9501ab1
update tags
nc-nb-gn-sdn-dev-msa Mar 17, 2022
3ba82d3
update tags
nc-nb-gn-sdn-dev-msa Mar 18, 2022
445ac0f
update tag
nc-nb-gn-sdn-dev-msa Mar 19, 2022
9590478
update tags
nc-nb-gn-sdn-dev-msa Mar 19, 2022
936ff32
update tag
nc-nb-gn-sdn-dev-msa Mar 21, 2022
d626d0a
update tags
nc-nb-gn-sdn-dev-msa Mar 22, 2022
80039bf
update tags
nc-nb-gn-sdn-dev-msa Mar 22, 2022
8291b3c
update tags
nc-nb-gn-sdn-dev-msa Mar 22, 2022
4a9e97c
update tags
nc-nb-gn-sdn-dev-msa Mar 23, 2022
82837f4
update tags
nc-nb-gn-sdn-dev-msa Mar 23, 2022
0ed747b
update tags
nc-nb-gn-sdn-dev-msa Mar 23, 2022
45ad023
update tags
nc-nb-gn-sdn-dev-msa Mar 25, 2022
502a7a4
update tags
nc-nb-gn-sdn-dev-msa Mar 25, 2022
669a9fc
update tags
nc-nb-gn-sdn-dev-msa Mar 28, 2022
d68723f
update tags
nc-nb-gn-sdn-dev-msa Mar 29, 2022
0c05826
update tags
nc-nb-gn-sdn-dev-msa Mar 29, 2022
003f2ed
update tags
nc-nb-gn-sdn-dev-msa Mar 30, 2022
e665ce9
update tags
nc-nb-gn-sdn-dev-msa Mar 30, 2022
f06b3c1
update tags
nc-nb-gn-sdn-dev-msa Mar 30, 2022
26eca81
update tags
nc-nb-gn-sdn-dev-msa Mar 30, 2022
f15d8cb
update tags
nc-nb-gn-sdn-dev-msa Mar 31, 2022
70b94a9
update tags
nc-nb-gn-sdn-dev-msa Mar 31, 2022
af8366a
update tags
nc-nb-gn-sdn-dev-msa Apr 1, 2022
0779094
Update docker-compose.yml
ArnaudFosse Apr 1, 2022
b4daef9
Update docker-compose.yml
ArnaudFosse Apr 1, 2022
d096f11
Update docker-compose.yml
ArnaudFosse Apr 4, 2022
2a4bd71
Update install.sh
ArnaudFosse Apr 4, 2022
c6c620b
Update install_win.sh
ArnaudFosse Apr 4, 2022
4b93602
update tags
nc-nb-gn-sdn-dev-msa Apr 4, 2022
ea00bbd
Merge branch '2.8.1' of github.com:ubiqube/quickstart into 2.8.1
nc-nb-gn-sdn-dev-msa Apr 4, 2022
503e64a
update tags
nc-nb-gn-sdn-dev-msa Apr 6, 2022
2d8c912
update tags
nc-nb-gn-sdn-dev-msa Apr 6, 2022
56d657e
update tags
nc-nb-gn-sdn-dev-msa Apr 7, 2022
2c0d0b6
update tags
nc-nb-gn-sdn-dev-msa Apr 7, 2022
5760866
update tags
nc-nb-gn-sdn-dev-msa Apr 8, 2022
cd7765b
update tags
nc-nb-gn-sdn-dev-msa Apr 8, 2022
c077e50
update tags
nc-nb-gn-sdn-dev-msa Apr 11, 2022
8fd11d4
update tags
nc-nb-gn-sdn-dev-msa Apr 11, 2022
7464df5
update tags
nc-nb-gn-sdn-dev-msa Apr 12, 2022
9fd192c
update tags
nc-nb-gn-sdn-dev-msa Apr 13, 2022
3c0d027
update tags
nc-nb-gn-sdn-dev-msa Apr 13, 2022
f9cbedb
update tags
nc-nb-gn-sdn-dev-msa Apr 13, 2022
9670270
update tags
nc-nb-gn-sdn-dev-msa Apr 13, 2022
3939068
update tags
nc-nb-gn-sdn-dev-msa Apr 14, 2022
c6bca1a
update tags
nc-nb-gn-sdn-dev-msa Apr 14, 2022
c049add
fix depends on
nc-nb-gn-sdn-dev-msa Apr 14, 2022
896185c
fix depends on
nc-nb-gn-sdn-dev-msa Apr 14, 2022
3d497ae
fix depends on
nc-nb-gn-sdn-dev-msa Apr 14, 2022
950a25d
fix depends on
nc-nb-gn-sdn-dev-msa Apr 14, 2022
0438658
update tags
nc-nb-gn-sdn-dev-msa Apr 15, 2022
c1c54c0
update tags
nc-nb-gn-sdn-dev-msa Apr 15, 2022
5d8b8d9
update tags
nc-nb-gn-sdn-dev-msa Apr 15, 2022
96129e7
update tags
nc-nb-gn-sdn-dev-msa Apr 15, 2022
9a7db51
update tags
nc-nb-gn-sdn-dev-msa Apr 19, 2022
ec0fba3
update tags
nc-nb-gn-sdn-dev-msa Apr 22, 2022
8847d02
update tags
nc-nb-gn-sdn-dev-msa May 2, 2022
2f7659d
update tags / simpler dependencies
nc-nb-gn-sdn-dev-msa May 2, 2022
d493f8d
merge from master
nc-nb-gn-sdn-dev-msa May 3, 2022
1941d2f
merge from 2.8.1
nc-nb-gn-sdn-dev-msa May 3, 2022
54fdd41
add sample XML with xmlns
nc-nb-gn-sdn-dev-msa May 3, 2022
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
19 changes: 13 additions & 6 deletions docker-compose.es_cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,19 +45,26 @@ services:
db:
restart: unless-stopped
container_name: msa_db
image: openmsa/openmsa:msa2-db-2.7.1-3fcbdecf6f64fa126deb88db61bcb0ebec3cf92d
command: postgres -c 'max_connections=800' -c 'max_prepared_transactions=100'
image: ubiqube/msa2-db:2513ba6c67d9bbdc4613495d4ad22582c80340c8
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
test: ["CMD-SHELL", "/usr/pgsql-12/bin/pg_isready -h localhost"]
timeout: 20s
interval: 30s
timeout: 60s
retries: 5
environment:
POSTGRES_PASSWORD: my_db_password
POSTGRES_DB: POSTGRESQL
CAMUNDA_PASSWORD: camunda
CAMUNDA_DB: process-engine
CAMUNDA_USER: camunda
KEY_VAULT_USER: key_vault
KEY_VAULT_DB: key_vault
PG_MODE: primary
PG_PRIMARY_USER: postgres
PG_PRIMARY_PASSWORD: my_db_password
PG_USER: postgres
PG_PASSWORD: my_db_password
PG_DATABASE: POSTGRESQL
PG_ROOT_PASSWORD: my_db_password
PG_PRIMARY_PORT: 5432
volumes:
- "msa_db:/var/lib/postgresql/data"

Expand Down
55 changes: 31 additions & 24 deletions docker-compose.ha.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ version: "3.8"

services:
msa-front:
image: openmsa/openmsa:msa2-front-2.7.1-9aa9326612ac849ce01f9cb5cff9672d12ee383b
image: ubiqube/msa2-front:d243e5c6d307b1edad751cfb0dd5ccd4ea2bc36c
depends_on:
- msa-api
- msa-ui
Expand Down Expand Up @@ -53,19 +53,26 @@ services:
# - "/mnt/NASVolume/msa_front:/etc/nginx/ssl"

db:
image: openmsa/openmsa:msa2-db-2.7.1-3fcbdecf6f64fa126deb88db61bcb0ebec3cf92d
command: postgres -c 'max_connections=800' -c "max_prepared_transactions=100"
image: ubiqube/msa2-db:2513ba6c67d9bbdc4613495d4ad22582c80340c8
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
test: ["CMD-SHELL", "/usr/pgsql-12/bin/pg_isready -h localhost"]
timeout: 20s
interval: 30s
timeout: 60s
retries: 5
environment:
POSTGRES_PASSWORD: my_db_password
POSTGRES_DB: POSTGRESQL
CAMUNDA_PASSWORD: camunda
CAMUNDA_DB: process-engine
CAMUNDA_USER: camunda
KEY_VAULT_USER: key_vault
KEY_VAULT_DB: key_vault
PG_MODE: primary
PG_PRIMARY_USER: postgres
PG_PRIMARY_PASSWORD: my_db_password
PG_USER: postgres
PG_PASSWORD: my_db_password
PG_DATABASE: POSTGRESQL
PG_ROOT_PASSWORD: my_db_password
PG_PRIMARY_PORT: 5432
volumes:
- "/mnt/NASVolume/msa_db:/var/lib/postgresql/data"
deploy:
Expand All @@ -74,7 +81,7 @@ services:
condition: on-failure

msa-api:
image: openmsa/openmsa:msa2-api-2.7.1-06a14410d5cc546291a5b9eb0273f534772e5f77
image: ubiqube/msa2-api:a116c83d873a77082db62ce7bbd745d61665f963
depends_on:
- db
healthcheck:
Expand Down Expand Up @@ -102,7 +109,7 @@ services:
aliases:
- "msa_api"
msa-ui:
image: openmsa/openmsa:msa2-ui-2.7.1-6ffb578e0ef967c0e6ba45802a539750af561e6e
image: ubiqube/msa2-ui:956d2c5f09c91e25841662db77e467942edf0dc4
depends_on:
- msa-api
healthcheck:
Expand Down Expand Up @@ -130,7 +137,7 @@ services:
aliases:
- "msa_ui"
msa-sms:
image: openmsa/openmsa:msa2-sms-2.7.1-4267849ebdda5d65962ef23ad1d97aebb167762a
image: ubiqube/msa2-sms:fbc1fc2933e67078fe8e2c0ba99a9807d6d59c16
depends_on:
- db
healthcheck:
Expand Down Expand Up @@ -158,7 +165,7 @@ services:
- "msa_sms"

msa-bud:
image: openmsa/openmsa:msa2-bud-2.7.1-ba8a039bf14f40e3873144f0c6827c65ef80516a
image: ubiqube/msa2-bud:ba8a039bf14f40e3873144f0c6827c65ef80516a
depends_on:
- db
healthcheck:
Expand All @@ -176,7 +183,7 @@ services:
depends_on:
- db
- msa-api
image: openmsa/openmsa:msa2-alarm-2.7.1-3b12f492adb5dd783add52720f0637634f09c551
image: ubiqube/msa2-alarm:444f58e121299db6949000f97a580011283571ea
healthcheck:
test: ["CMD-SHELL", "/etc/init.d/ubi-alarm status | grep -q 'service seems UP' || exit 1"]
environment:
Expand All @@ -195,7 +202,7 @@ services:
- "msa_alarm"

msa-monitoring:
image: openmsa/openmsa:msa2-monitoring-2.7.1-bf8a71dbc842bec423b3dd85af335ff81aad63f2
image: ubiqube/msa2-monitoring:c6e11c3bc005a22b1c1d83052bf4d4fa3a62c66c
healthcheck:
test: ["CMD-SHELL", "/etc/init.d/ubi-poll status | grep -q 'service seems UP' || exit 1"]
depends_on:
Expand Down Expand Up @@ -224,7 +231,7 @@ services:
camunda:
depends_on:
- db
image: openmsa/openmsa:msa2-camunda-2.7.0GA-507b2c9b8361821915c4bd9255bafb47ace89079
image: ubiqube/msa2-camunda:507b2c9b8361821915c4bd9255bafb47ace89079
deploy:
replicas: 1
placement:
Expand All @@ -238,8 +245,8 @@ services:
WAIT_FOR: 'db:5432'
WAIT_FOR_TIMEOUT: 60

msa-es:
image: openmsa/openmsa:msa2-es-2.7.0GA-6b191fca4d76383f04930565d90dbf58a051eed4
msa_es:
image: ubiqube/msa2-es:f1d8ba7f38e65a375af4c22f9f2676a2cb480f8f
healthcheck:
test: ["CMD-SHELL", "test -f /home/install/init-done && curl -s -XGET -H 'Authorization: Basic c3VwZXJ1c2VyOnheWnl1R002fnU9K2ZZMkc=' 'http://localhost:9200/_cluster/health?pretty' | grep -q 'status.*green' || exit 1"]
timeout: 2s
Expand All @@ -263,8 +270,8 @@ services:
aliases:
- "msa_es"

msa-kibana:
image: openmsa/openmsa:msa2-kibana-2.7.0GA-e882bf60f8eeee721e7a9037efd86198ec5a5635
msa_kibana:
image: ubiqube/msa2-kibana:e882bf60f8eeee721e7a9037efd86198ec5a5635
depends_on:
- msa-es
ports:
Expand All @@ -282,8 +289,8 @@ services:
aliases:
- "msa_kibana"

msa-ai-ml:
image: openmsa/openmsa:msa2-ai-ml-2.7.0GA-63c7fab8c111b6cc85da049f45ebc6175a9b269a
msa_ai_ml:
image: ubiqube/msa2-ai-ml:63c7fab8c111b6cc85da049f45ebc6175a9b269a
healthcheck:
test: ["CMD-SHELL", "python /msa_proj/health_check.py"]
ports:
Expand All @@ -299,8 +306,8 @@ services:
aliases:
- "msa_ai_ml"

msa-cerebro:
image: openmsa/openmsa:msa2-cerebro-2.7.0GA-7144f86eec3b2a326066046446187f86a75515b1
msa_cerebro:
image: ubiqube/msa2-cerebro:7144f86eec3b2a326066046446187f86a75515b1
environment:
AUTH_TYPE: basic
BASIC_AUTH_USER: cerebro
Expand All @@ -321,8 +328,8 @@ services:
aliases:
- "msa_cerebro"

msa-dev:
image: openmsa/openmsa:msa2-linuxdev-2.7.1-90dd3efa2a57bdaca087d8812a147718a3c4e8ae
msa_dev:
image: ubiqube/msa2-linuxdev:f97770af16925f812debf25bf26b5847a670d4df
depends_on:
- msa-es
deploy:
Expand Down
19 changes: 13 additions & 6 deletions docker-compose.light.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,19 +44,26 @@ services:
db:
restart: unless-stopped
container_name: msa_db
image: openmsa/openmsa:msa2-db-2.7.1-3fcbdecf6f64fa126deb88db61bcb0ebec3cf92d
command: postgres -c 'max_connections=800' -c 'max_prepared_transactions=100'
image: ubiqube/msa2-db:2513ba6c67d9bbdc4613495d4ad22582c80340c8
healthcheck:
test: ["CMD-SHELL", "pg_isready -U postgres"]
test: ["CMD-SHELL", "/usr/pgsql-12/bin/pg_isready -h localhost"]
timeout: 20s
interval: 30s
timeout: 60s
retries: 5
environment:
POSTGRES_PASSWORD: my_db_password
POSTGRES_DB: POSTGRESQL
CAMUNDA_PASSWORD: camunda
CAMUNDA_DB: process-engine
CAMUNDA_USER: camunda
KEY_VAULT_USER: key_vault
KEY_VAULT_DB: key_vault
PG_MODE: primary
PG_PRIMARY_USER: postgres
PG_PRIMARY_PASSWORD: my_db_password
PG_USER: postgres
PG_PASSWORD: my_db_password
PG_DATABASE: POSTGRESQL
PG_ROOT_PASSWORD: my_db_password
PG_PRIMARY_PORT: 5432
volumes:
- "msa_db:/var/lib/postgresql/data"

Expand Down
Loading