Produced by Araxis Merge on 5/10/2018 8:27:21 AM 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 | OSCIF MHED P3 Annie.zip\cms-vet-app-release-v4.0.1@103ac3fb628.zip\PatientApp | run.sh | Wed Mar 21 18:37:29 2018 UTC |
2 | OSCIF MHED P3 Annie.zip\cms-vet-app-release-v4.0.1@103ac3fb628.zip\PatientApp | run.sh | Wed May 9 16:08:03 2018 UTC |
Description | Between Files 1 and 2 |
|
---|---|---|
Text Blocks | Lines | |
Unchanged | 2 | 44 |
Changed | 1 | 2 |
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 | #!/usr/bin /env bash | |
2 | ||
3 | source nex tgen/app.e nv | |
4 | export DTR _PREFIX= DNS . PORT / DTR_ORG= images | |
5 | ||
6 | # Set DTR for Docker - Perform against A LL Dockerf iles in yo ur project | |
7 | /usr/bin/p erl -i -pe "s|%%DTR_ PREFIX%%|$ DTR_PREFIX |" nextgen /Dockerfil e || { ech o "FATAL: Could not set DTR Pr efix"; exi t 1; } | |
8 | /usr/bin/p erl -i -pe "s|%%DTR_ ORG%%|$DTR _ORG|" nex tgen/Docke rfile || { echo "FAT AL: Could not set DT R Organiza tion'"; ex it 1; } | |
9 | ||
10 | echo -e "\ nStopping anything t hat's curr ently runn ing…\n" | |
11 | docker-com pose stop || { echo "*** FAILE D: Couldn' t stop run ning conta iners."; e xit -1; } | |
12 | ||
13 | echo -e "\ nBuilding new contai ner \n" | |
14 | docker-com pose build --no-cach e || { ech o "*** FAI LED: Could n't build new contai ner."; exi t -1; } | |
15 | ||
16 | echo -e "\ nStarting running do cker conta iner…\n" | |
17 | docker-com pose up -d || { echo "*** FAIL ED: Could not start up using d ocker-comp ose."; exi t -1; } | |
18 | ||
19 | echo -e "\ nRegister in consul. ..\n" | |
20 | curl -H "X -Consul-To ken: 7BE78 4A4-7498-4 469-BE2F-9 C3B9444DFE F" -s -X P UT localho st:8500/v1 /kv/vamf/l ocal/apiga teway/1.0/ services/a nnie-patie nt -d '{"l ocation":" /annie-vet ","service ":"cms-vet -app","bas ePath":"/a nnie-vet", "redirect" :"off","he aders":{"X -Real-IP": "$remote_a ddr"}}' > /dev/null || { echo "*** FAILE D: Failed to registe r in Consu l."; exit -1; } | |
21 | ||
22 | # using th e registra tion above , both ann ie-vet and annie-vet -beta are available. To expose only beta , use the registrati on below i nstead | |
23 | # curl -H "X-Consul- Token: 7BE 784A4-7498 -4469-BE2F -9C3B9444D FEF" -s -X PUT local host:8500/ v1/kv/vamf /local/api gateway/1. 0/services /annie-pat ient -d '{ "location" :"/annie-v et-beta"," service":" cms-vet-ap p","basePa th":"/anni e-vet","re direct":"o ff","heade rs":{"X-Re al-IP":"$r emote_addr "}}' > /de v/null || { echo "** * FAILED: Failed to register i n Consul." ; exit -1; } |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.