Travis build test integration & changes to docker deployment

This commit is contained in:
Brendan LE GLAUNEC
2016-11-20 13:17:25 +01:00
committed by Brendan Le Glaunec
parent f86683d9ca
commit 2961d68200
12 changed files with 87 additions and 23 deletions
+4 -6
View File
@@ -10,18 +10,16 @@ COL_MAGENTA=$ESC_SEQ"35;01m"
COL_CYAN=$ESC_SEQ"36;01m"
echo -e $COL_YELLOW"Deleting old package ... "$COL_RESET
rm -f cameradar_*_Release_Linux.tar.gz
rm -f cameradar_*_${1:-"Release"}_Linux.tar.gz
echo -e $COL_GREEN"OK!"$COL_RESET
echo -e $COL_YELLOW"Creating package ... "$COL_RESET
{
cd ..
mkdir build
cd build
rm -f cameradar_*_Release_Linux.tar.gz
cmake .. -DCMAKE_BUILD_TYPE=Release
rm -f cameradar_*_${1:-"Release"}_Linux.tar.gz
cmake .. -DCMAKE_BUILD_TYPE=${1:-"Release"}
make package
cp cameradar_*_Release_Linux.tar.gz ../deployment
cp cameradar_*_${1:-"Release"}_Linux.tar.gz ../deployment
cd ../deployment
} &> /dev/null
echo -e $COL_GREEN"OK!"$COL_RESET
Binary file not shown.
Binary file not shown.
+13
View File
@@ -21,8 +21,21 @@ for arg; do
esac
done
if [ "$CACHE_MANAGER" == "" ]; then
export CACHE_MANAGER="dumb"
fi
if [ "$CAMERAS_SUBNETWORKS" == "" ]; then
export CAMERAS_SUBNETWORKS="0.0.0.0"
fi
if [ "$CAMERAS_PORTS" == "" ]; then
export CAMERAS_PORTS="554,8554"
fi
envsubst < /cameradar/conf/cameradar.tmpl.conf.json > /cameradar/conf/cameradar.conf.json
if [ "$CACHE_MANAGER" == "mysql" ] && [ "$1" = '/cameradar/bin/cameradar' -a -z "$wantHelp" ]; then
echo -n "Waiting for cameradar-database to be ready..."
while ! mysqladmin ping -h "cameradar-database" -P3306 --silent; do