Produced by Araxis Merge on 4/8/2019 1:00:39 PM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\AraxisMergeCompare\Pri_un\crp-fitheart-release-2.0\nextgen | docker-compose.build.yml | Wed Mar 20 17:30:00 2019 UTC |
| 2 | C:\AraxisMergeCompare\Pri_re\MHED P3 Healthshare 2.0-redacted\crp-fitheart-release-2.0\nextgen | docker-compose.build.yml | Mon Apr 8 16:54:01 2019 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 20 | 180 |
| Changed | 19 | 62 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | version: ' 2.0' | |
| 2 | services: | |
| 3 | builder: | |
| 4 | image: ${D TR_PREFIX_ AWS-273226 111724.dkr .ecr.us-ea st-1.amazo naws.com/} DNS /appbuildt ools | |
| 5 | volume s: | |
| 6 | - .. /..:/works pace | |
| 7 | enviro nment: | |
| 8 | - GE M_BUILD_ON LY=${GEM_B UILD_ONLY: -true} | |
| 9 | - GE M_HOME=/tm p | |
| 10 | - HO ME=/tmp | |
| 11 | - DT R_PREFIX=$ {DTR_PREFI X} | |
| 12 | - DT R_ORG=${DT R_ORG} | |
| 13 | - GI T_COMMITTE R_NAME=bui lder | |
| 14 | - GI T_COMMITTE R_EMAIL=bu ilder | |
| 15 | ||
| 16 | # Mongo mo ck for qua rtz and no tification s, usernam e/pass aut henticatio n turned o n by defau lt | |
| 17 | # SSL turn ed off by default | |
| 18 | mongo: | |
| 19 | image: mob ileapps. DNS .us: PORT /ckm/mock- mongo:1.0. 0 | |
| 20 | expose : | |
| 21 | - " PORT " | |
| 22 | ports: | |
| 23 | - " PORT " | |
| 24 | enviro nment: | |
| 25 | - MONGODB_ ADMIN_USER = AI | |
| 26 | - MONGODB_ ADMIN_PASS = AI | |
| 27 | - MONG ODB_APPLIC ATION_DATA BASE=notif icationsdb , reminder sdb, taskr esourcesdb | |
| 28 | - MONGODB_ APPLICATIO N_USER= AI | |
| 29 | - MONGODB_ APPLICATIO N_PASS= AI | |
| 30 | - SSL_ ENABLED=fa lse | |
| 31 | - AUTH _ENABLED=t rue | |
| 32 | - JOUR NALING=tru e | |
| 33 | ||
| 34 | ||
| 35 | #Quartz Scheduler | |
| 36 | vamf-qua rtz-schedu ler: | |
| 37 | image: mob ileapps. DNS .us: PORT /ckm/vamf- quartz-sch eduler:1.4 .0 | |
| 38 | ports: | |
| 39 | - "POR T:PORT" | |
| 40 | enviro nment: | |
| 41 | - "VAM F_ENVIRONM ENT=local" | |
| 42 | # Use Vault | |
| 43 | - VAULT_AD DR=http:// vault: PORT | |
| 44 | - SECR ET_PATH=se cret/local /quartz-sc heduler | |
| 45 | # Use consul | |
| 46 | - USE_ ENVCONSUL= true | |
| 47 | - "CONSUL_ SERVER=con sul: PORT " | |
| 48 | - "CONSUL_ TOKEN= R E D A
|
|
| 49 | - "CON SUL_PATH=a ppconfig/l ocal/quart z-schedule r" | |
| 50 | #- "MONGO_ NOTIFICATI ONS_URI=mo ngodb://mo ngo: PORT /notificat ionsdb?ssl =false&con nectTimeou tMS=20000& maxPoolSiz e=100" | |
| 51 | - "MONGO_N OTIFICATIO NS_URI=mon godb://tes tuser:test pass@mongo : PORT /notificat ionsdb?ssl =false&con nectTimeou tMS=20000& maxPoolSiz e=100" | |
| 52 | - "SMTP_HO ST= SERVER " | |
| 53 | - "SMTP_PO RT= PORT " | |
| 54 | - "SMT P_SENDER=m ailsender@ localhost. com" | |
| 55 | - "SMT P_USERNAME =mailsende r@localhos t.com" | |
| 56 | - "SMTP_PA SSWORD= AI " | |
| 57 | - "SMT P_AUTH=fal se" | |
| 58 | - "SMT P_CONNECTI ONTIMEOUT= 10000" | |
| 59 | - "SMT P_TIMEOUT= 10000" | |
| 60 | - "SMT P_STARTTLS _ENABLED=t rue" | |
| 61 | - "SMT P_SSL_TRUS T=*" | |
| 62 | - "ORACLED B_URL=jdbc :oracle:th in:@qss-mo ck: PORT :xe" | |
| 63 | #- "ORACLE DB_USER=
|
|
| 64 | #- "ORACLE DB_PASSWOR D= AI " #set in vault | |
| 65 | depend s_on: | |
| 66 | - mong o | |
| 67 | - qss- mock | |
| 68 | - vaul t | |
| 69 | links: | |
| 70 | - mong o | |
| 71 | - qss- mock | |
| 72 | - vaul t | |
| 73 | - mock -smtp-serv er | |
| 74 | ||
| 75 | # QSS Mock | |
| 76 | ||
| 77 | qss-mock : | |
| 78 | image: mob ileapps. DNS .us: PORT /ckm/docke r-roa-mock :1.0.3 | |
| 79 | #image : roa-mock -test | |
| 80 | ports: | |
| 81 | - 1521 | |
| 82 | ||
| 83 | #VAMF Notificati on Service s | |
| 84 | vamf-not ification- services: | |
| 85 | image: mob ileapps. DNS .us: PORT /ckm/vamf- notificati on-service s:1.4.0 | |
| 86 | ports: | |
| 87 | - "810 0:8080" | |
| 88 | enviro nment: | |
| 89 | - "VAM F_ENVIRONM ENT=local" | |
| 90 | # No S ecrets don 't Use Vau lt | |
| 91 | #- VAULT_A DDR=http:/ /vault: PORT | |
| 92 | #- SEC RET_PATH=s ecret/loca l/pns | |
| 93 | # Use consul | |
| 94 | - USE_ ENVCONSUL= true | |
| 95 | - "CONSUL_ SERVER=con sul: PORT " | |
| 96 | - "CONSUL_ TOKEN= R E D A
|
|
| 97 | - "CON SUL_PATH=a ppconfig/l ocal/pns" | |
| 98 | - "JAV A_OPTS=-Xm s256m -Xmx 512m -XX:- TieredComp ilation -X ss256k -XX :+UseG1GC -XX:+UseSt ringDedupl ication" | |
| 99 | - "QSS_BAS E_URL=http :// DNS -quartz-sc heduler: PORT /qss/v1" | |
| 100 | # Unco mment if r unning the mongo moc k without authentica tion | |
| 101 | #- "MONGO_ NOTIFICATI ONS_URI=mo ngodb://mo ngo: PORT /notificat ionsdb?ssl =false&con nectTimeou tMS=20000& maxPoolSiz e=100" | |
| 102 | #- "MONGO_ REMINDERS_ URI=mongod b://mongo: PORT /reminders db?ssl=fal se&connect TimeoutMS= 20000&maxP oolSize=10 0" | |
| 103 | - "MONGO_N OTIFICATIO NS_URI=mon godb://tes tuser:test pass@mongo : PORT /notificat ionsdb?ssl =false&con nectTimeou tMS=20000& maxPoolSiz e=100" | |
| 104 | - "MONGO_R EMINDERS_U RI=mongodb ://testuse r:testpass @mongo: PORT /reminders db?ssl=fal se&connect TimeoutMS= 20000&maxP oolSize=10 0" | |
| 105 | - SERV ICE_TAGS=l ocal | |
| 106 | - SERV ICE_NAME=v amf-notifi cation-ser vices | |
| 107 | depend s_on: | |
| 108 | - mong o | |
| 109 | - vamf -quartz-sc heduler | |
| 110 | links: | |
| 111 | - mong o | |
| 112 | - vamf -quartz-sc heduler | |
| 113 | - vaul t | |
| 114 | - mock -smtp-serv er | |
| 115 | restar t: on-fail ure | |
| 116 | ||
| 117 | ||
| 118 | networks: | |
| 119 | default: | |
| 120 | extern al: | |
| 121 | name: apigateway -network |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.