Merge branch '1.2.x'

Author: CodeCasterX

docker/deploy.sh

@@ -10,6 +10,8 @@ mkdir -p app-platform-tmp/fit-runtime
 mkdir -p app-platform-tmp/jade-db
 mkdir -p app-platform-tmp/log
 echo "Starting service..."
-docker-compose up -d
+docker-compose -p app-platform up -d
 echo "Service started"
+docker stop db-initializer
+docker rm db-initializer
 echo "=== Finished ==="

docker/import_model.sh

@@ -16,5 +16,5 @@ ${SED} "s#BASE_URL#${BASE_URL}#g" ${WORKSPACE}/sql/init/data/tr_init_models.sql
 ${SED} "s#APIKEY#${APIKEY}#g" ${WORKSPACE}/sql/init/data/tr_init_models.sql
 
 if [[ "${OS_TYPE}" == "Darwin" ]]; then
-  rm -f docker/sql/init/data/tr_init_models.sql\'.bak\'
+  rm -f ${WORKSPACE}/sql/init/data/tr_init_models.sql\'.bak\'
 fi