302. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 5/10/2018 8:27:03 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.

302.1 Files compared

# Location File Last Modified
1 OSCIF MHED P3 Annie.zip\cms-staff-app-release-4.0.0@aff5ba84233.zip\MessagingApp run.sh Thu Feb 22 10:28:51 2018 UTC
2 OSCIF MHED P3 Annie.zip\cms-staff-app-release-4.0.0@aff5ba84233.zip\MessagingApp run.sh Wed May 9 13:07:11 2018 UTC

302.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 50
Changed 1 2
Inserted 0 0
Removed 0 0

302.3 Comparison options

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

302.4 Active regular expressions

No regular expressions were active.

302.5 Comparison detail

  1   #!/usr/bin /env bash
  2  
  3   source nex tgen/app.e nv
  4   export DTR _PREFIX=mo bileapps. DNS    .us:9250/  DTR_ORG=im ages
  5  
  6   # for loca l developm ent, repla ce courier -resources -staff wit h courier- resources- vet so we  only need  one servic e containe r running
  7   /usr/bin/p erl -i -pe  "s|courie r-resource s-staff|co urier-reso urces-vet| " dist/res ource-dire ctory.json  || { echo  "FATAL: C ould not r eplace end points in  resource-d irectory";  exit 1; }
  8  
  9   # Set DTR  for Docker  - Perform  against A LL Dockerf iles in yo ur project
  10   /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; }
  11   /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; }
  12  
  13   echo -e "\ nStopping  anything t hat's curr ently runn ing…\n"
  14   docker-com pose stop  || { echo  "*** FAILE D: Couldn' t stop run ning conta iners."; e xit -1; }
  15  
  16   echo -e "\ nBuilding  new contai ner \n"
  17   docker-com pose build  --no-cach e || { ech o "*** FAI LED: Could n't build  new contai ner."; exi t -1; }
  18  
  19   echo -e "\ nStarting  running do cker conta iner…\n"
  20   docker-com pose up -d  || { echo  "*** FAIL ED: Could  not start  up using d ocker-comp ose."; exi t -1; }
  21  
  22   echo -e "\ nRegister  in consul. ..\n"
  23   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-provi der -d '{" location": "/annie-pr ovider","s ervice":"c ms-staff-a pp","baseP ath":"/ann ie-provide r","redire ct":"off", "headers": {"X-Real-I P":"$remot e_addr"}}'  > /dev/nu ll || { ec ho "*** FA ILED: Fail ed to regi ster in Co nsul."; ex it -1; }
  24  
  25   # using th e registra tion above , both ann ie-provide r and anni e-provider -beta are  available.  To expose  only beta , use the  registrati on below i nstead
  26   #curl -H " X-Consul-T oken: 7BE7 84A4-7498- 4469-BE2F- 9C3B9444DF EF" -s -X  PUT localh ost:8500/v 1/kv/vamf/ local/apig ateway/1.0 /services/ annie-prov ider -d '{ "location" :"/annie-p rovider-be ta","servi ce":"cms-s taff-app", "basePath" :"/annie-p rovider"," redirect": "off","hea ders":{"X- Real-IP":" $remote_ad dr"}}' > / dev/null | | { echo " *** FAILED : Failed t o register  in Consul ."; exit - 1; }