Merge pull request #51 from IBM-Cloud/dev

Sync
IBM-Cloud · Nov 11, 2019 · e2ff4ff · e2ff4ff
2 parents 1490baf + bd2470a
commit e2ff4ff
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/.bluemix/pipeline-DEPLOY.sh b/.bluemix/pipeline-DEPLOY.sh
@@ -35,30 +35,30 @@ case "${REGION_ID}" in
   ;;
 esac
 # Deploy app
-if ! bx app show $CF_APP; then
-  bx app push $CF_APP -n $CF_APP --no-start
-  bx app env-set $CF_APP LOGISTICS_WIZARD_ENV ${LOGISTICS_WIZARD_ENV}
-  bx app env-set $CF_APP ERP_SERVICE https://$ERP_SERVICE_APP_NAME$domain
-  bx app env-set $CF_APP FUNCTIONS_NAMESPACE_URL ${FUNCTIONS_NAMESPACE_URL}
-  bx app start $CF_APP
+if ! ibmcloud cf app $CF_APP; then
+  ibmcloud cf push $CF_APP -n $CF_APP --no-start
+  ibmcloud cf set-env $CF_APP LOGISTICS_WIZARD_ENV ${LOGISTICS_WIZARD_ENV}
+  ibmcloud cf set-env $CF_APP ERP_SERVICE https://$ERP_SERVICE_APP_NAME$domain
+  ibmcloud cf set-env $CF_APP FUNCTIONS_NAMESPACE_URL ${FUNCTIONS_NAMESPACE_URL}
+  ibmcloud cf start $CF_APP
 else
   OLD_CF_APP=${CF_APP}-OLD-$(date +"%s")
   rollback() {
     set +e
-    if bx app show $OLD_CF_APP; then
-      bx app logs $CF_APP --recent
-      bx app delete $CF_APP -f
-      bx app rename $OLD_CF_APP $CF_APP
+    if ibmcloud cf app $OLD_CF_APP; then
+      ibmcloud cf logs $CF_APP --recent
+      ibmcloud cf delete $CF_APP -f
+      ibmcloud cf rename $OLD_CF_APP $CF_APP
     fi
     exit 1
   }
   set -e
   trap rollback ERR
-  bx app rename $CF_APP $OLD_CF_APP
-  bx app push $CF_APP -n $CF_APP --no-start
-  bx app env-set $CF_APP LOGISTICS_WIZARD_ENV ${LOGISTICS_WIZARD_ENV}
-  bx app env-set $CF_APP ERP_SERVICE https://$ERP_SERVICE_APP_NAME$domain
-  bx app env-set $CF_APP FUNCTIONS_NAMESPACE_URL ${FUNCTIONS_NAMESPACE_URL}
-  bx app start $CF_APP
-  bx app delete $OLD_CF_APP -f
+  ibmcloud cf rename $CF_APP $OLD_CF_APP
+  ibmcloud cf push $CF_APP -n $CF_APP --no-start
+  ibmcloud cf set-env $CF_APP LOGISTICS_WIZARD_ENV ${LOGISTICS_WIZARD_ENV}
+  ibmcloud cf set-env $CF_APP ERP_SERVICE https://$ERP_SERVICE_APP_NAME$domain
+  ibmcloud cf set-env $CF_APP FUNCTIONS_NAMESPACE_URL ${FUNCTIONS_NAMESPACE_URL}
+  ibmcloud cf start $CF_APP
+  ibmcloud cf delete $OLD_CF_APP -f
 fi
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:2.7.13
+FROM python:3.7.1
 
 ADD bin /app/bin
 ADD server /app/server
@@ -9,7 +9,6 @@ ADD sample_event.json /app/sample_event.json
 ADD setup.py /app/setup.py
 
 ENV ERP_SERVICE http://lw-erp:8080
-ENV OPENWHISK_PACKAGE=lwr
 
 ENV PORT 8080
 EXPOSE 8080

diff --git a/runtime.txt b/runtime.txt
@@ -1 +1 @@
-python-3.7.4
+python-3.7.1