Produced by Araxis Merge on 10/5/2018 9:06: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 | MHEDP3_VAOS_VATS_SM_Sept2018.zip\VAR 4.5.2\var-resources-4.5.2.zip | README.md | Wed Aug 15 03:28:53 2018 UTC |
| 2 | MHEDP3_VAOS_VATS_SM_Sept2018.zip\VAR 4.5.2\var-resources-4.5.2.zip | README.md | Sat Oct 6 00:12:17 2018 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 182 |
| Changed | 2 | 6 |
| 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 | ## Build | |
| 2 | ||
| 3 | ``` | |
| 4 | <ENV=VAL.. .> ./build .sh | |
| 5 | ``` | |
| 6 | ||
| 7 | The follow ing enviro nment vari ables are optional, but can be prepended to the co mmand as d ocumented above. | |
| 8 | 1. BUILD_D IR: output directory for artif acts (defa ult: ./bui ld) | |
| 9 | 2. STAGING _DIR: dire ctory for intermedia te build a nd packagi ng (defaul t: ./dist) | |
| 10 | 3. DTR_PRE FIX: prefi x for targ et Docker trusted re gistry (on ly read is currently needed, d efault: de v) | |
| 11 | 4. DTR_ORG : organiza tion label for targe t Docker t rusted reg istry (onl y read is currently needed, de fault: bla nk) | |
| 12 | 5. BUILD_N UMBER: bui ld number | |
| 13 | 6. APPDATE : build da te | |
| 14 | ||
| 15 | Note for d evelopers: leaving b oth DTR_PR EFIX and D TR_ORG bla nk will de fault the build to u se the sou rce docker image at dev/image (unless ov erridden i n app.env, for examp le). This can be do ne when bu ilding out the image s manually and autom atically t agging to the local dev regist ry. For m ore detail ed informa tion on th is process , see the following developmen t setup in structions at <wiki url> | |
| 16 | ||
| 17 | ## Build t he project for local deploymen t | |
| 18 | ||
| 19 | 1. Build t he *centos 7-base* do cker image (see proj ect for in structions ) | |
| 20 | 2. Build t he *centos 7-openjdk8 * docker i mage (see project fo r instruct ions) | |
| 21 | 3. Build t he *centos 7-openjdk8 -tomcat* d ocker imag e (see pro ject for i nstruction s) | |
| 22 | 4. From th e var-reso urces proj ect direct ory, run ` source app .env` | |
| 23 | 5. From th e var-reso urces proj ect direct ory, Run ` build.sh` | |
| 24 | 6. Change directory to *dist* | |
| 25 | 7. From *d ist* folde r, Run `do cker build -t dev/va r-resource s .` | |
| 26 | ||
| 27 | Note: Step s 1-3 are only requi re to be e xecuted on ce. Only t he project build is necessary when chang es are mad e to the p roject. | |
| 28 | ||
| 29 | ## Running Locally W ithout Inn ovations S tack | |
| 30 | ||
| 31 | 1. Run `do cker run - p 9092:808 0 dev/var- resources` | |
| 32 | ||
| 33 | ## Running Locally W ith the In novations Stack | |
| 34 | ||
| 35 | 1. Add th e followin g section of code to the docke r-compose. yml file i n the dock er local d evelopment project. | |
| 36 | (https://c oderepo.mo bilehealth .va.gov/pr ojects/DEV /repos/doc ker-local- developmen t/) | |
| 37 | ||
| 38 | *Warning* Spacing in yaml is i mportant | |
| 39 | ``` | |
| 40 | var-resour ces: | |
| 41 | image: d ev/var-res ources | |
| 42 | links: | |
| 43 | - var-m essaging-m icroservic e | |
| 44 | depends_ on: | |
| 45 | - var-m essaging-m icroservic e | |
| 46 | ports: | |
| 47 | - "PORT :PORT" | |
| 48 | - "PORT :PORT" | |
| 49 | environm ent: | |
| 50 | - SERVI CE_64058_I GNORE=true | |
| 51 | - SERVI CE_TAGS=lo cal | |
| 52 | - SERVI CE_NAME=va r-resource s | |
| 53 | - JWT_S ECRET=test testtest | |
| 54 | - JAVA_ OPTS=-XX:+ CMSClassUn loadingEna bled -Xrs -Djavax.xm l.soap.Mes sageFactor y=weblogic .xml.saaj. MessageFac toryImpl - Dcom.sun.x ml.ws.tran sport.http .client.Ht tpTranspor tPipe.dump =true -age ntlib:jdwp =transport =dt_socket ,server=y, suspend=n, address=64 058 | |
| 55 | ``` | |
| 56 | Note the d ependency on the VMM , ensure y ou have th e VMM in y our local stack as w ell. The 64058 port is used f or remote debugging -- this wi ll not be exposed in a prod se tting. | |
| 57 | ||
| 58 | 2. Add the curl comm and to the run.sh fi le in the dockerloca l_developm ent stack | |
| 59 | ||
| 60 | ``` | |
| 61 | curl - H "X-Consu l-Token: 7 BE784A4-74 98-4469-BE 2F-9C3B944 4DFEF" -s -X PUT loc alhost:850 0/v1/kv/va mf/local/a pigateway/ 1.0/servic es/var-res ources -d '{"locatio n":"/Veter anAppointm entRequest Service"," service":" var-resour ces-8080", "redirect" :"off","he aders":{"X -Real-IP": "$remote_a ddr"}}' > /dev/null | |
| 62 | ``` | |
| 63 | ||
| 64 | 3. To view changes w hile worki ng in the innovation stack: | |
| 65 | 1. Run these two commands in the ter minal at t he root of this repo | |
| 66 | 1. Run `buil d.sh` | |
| 67 | 2. From *dis t* folder, run `dock er build - t dev/var- resources .` | |
| 68 | 2. Run these two commands in the ter minal at t he docker- local-deve lopment di rectory | |
| 69 | 1. `docker-c ompose kil l var-reso urces` | |
| 70 | 2. `docker-c ompose up -d var-res ources` | |
| 71 | ||
| 72 | ## Configu ring VAR R esources | |
| 73 | ||
| 74 | If the def ault value s in the p roperties files loca ted in `sr c/main/res ources/pro perties` a re not suf ficient, y ou can ove rride any of them by adding an environme nt variabl e under th e `environ ment:` sec tion of th e `docker- compose.ym l` file, s uch as the example b elow that changes th e number o f days for recall. | |
| 75 | ||
| 76 | ``` | |
| 77 | var-resour ces: | |
| 78 | image: d ev/var-res ources | |
| 79 | links: | |
| 80 | - var-m essaging-m icroservic e | |
| 81 | depends_ on: | |
| 82 | - var-m essaging-m icroservic e | |
| 83 | ports: | |
| 84 | - "PORT :PORT" | |
| 85 | environm ent: | |
| 86 | - SERVI CE_TAGS=lo cal | |
| 87 | - SERVI CE_NAME=va r-resource s | |
| 88 | - JWT_S ECRET=test testtest | |
| 89 | - JAVA_ OPTS=-XX:+ CMSClassUn loadingEna bled -Xrs -Djavax.xm l.soap.Mes sageFactor y=weblogic .xml.saaj. MessageFac toryImpl - Dcom.sun.x ml.ws.tran sport.http .client.Ht tpTranspor tPipe.dump =true | |
| 90 | - recal l.num.days =45 | |
| 91 | ``` | |
| 92 | ||
| 93 | ## Running unit test s | |
| 94 | Simply run `gradlew test`. Tes ts can be run and de bugged fro m IntelliJ : right cl ick the 't est' folde r (or any package or spec belo w) and sel ect 'Run' or 'Debug' . |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.