diff options
| author |   Christopher Lott (cl778h) <clott@research.att.com> | 2017-07-20 08:31:57 -0400 |
|---|---|---|
| committer | Christopher Lott (cl778h) <clott@research.att.com> | 2017-07-20 11:51:24 -0400 |
| commit | b58317907044b0cd72f1cdd8582800dc2c764b40 (patch) | |
| tree | 3e6f7db75ceeadd7571403b46e2d22ac8ac01014 /deliveries | |
| parent | c67680ada04c96a1753c037d67080c65628d32ca (diff) | |
Add portal property; correct docker build script.
New Portal property services.widget.protocol controls whether http or https
protocol is used to access the widget microservice endpoints.
Adjust build script to use new name "sdk" when building Docker with Portal apps
(formerly named ecompsdkos).
Change-Id: I25b7f39d40351da04c7a9dc3cc1c75ddad2750ea
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'deliveries')
| -rw-r--r-- | deliveries/.gitignore | 1 | ||||
| -rw-r--r-- | deliveries/dbstop.sh | 2 | ||||
| -rwxr-xr-x | deliveries/os_build_febe.sh | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/deliveries/.gitignore b/deliveries/.gitignore new file mode 100644 index 00000000..f12ac3a0 --- /dev/null +++ b/deliveries/.gitignore @@ -0,0 +1 @@ +/PROJECT diff --git a/deliveries/dbstop.sh b/deliveries/dbstop.sh index 6fb7dc3f..319b28ba 100644 --- a/deliveries/dbstop.sh +++ b/deliveries/dbstop.sh @@ -1,2 +1,2 @@ docker stop ecompdb_portal -docker rm ecompdb_portal
\ No newline at end of file +docker rm ecompdb_portal diff --git a/deliveries/os_build_febe.sh b/deliveries/os_build_febe.sh index c9110892..d9a59bf1 100755 --- a/deliveries/os_build_febe.sh +++ b/deliveries/os_build_febe.sh @@ -1,4 +1,5 @@ #!/bin/bash +# Builds docker with three webapps: portal app, portal-sdk app, dbc app # Stop on error; show output set -e -x @@ -36,7 +37,7 @@ cp -r ecomp-portal-BE-common $PROJECTDIR/ecomp-portal-BE-common cp -r ecomp-portal-BE-os $PROJECTDIR/ecomp-portal-BE-os cp -r ecomp-portal-DB-common $PROJECTDIR/ecomp-portal-DB-common cp -r ecomp-portal-DB-os $PROJECTDIR/ecomp-portal-DB-os -cp -r ecompsdkos/ecomp-sdk $PROJECTDIR/ecomp-sdk +cp -r sdk/ecomp-sdk $PROJECTDIR/ecomp-sdk cd $PROJECTDIR/ecomp-portal-BE-common ${MVN} install |