Release 1.0.35

Author: predix-adoption-bot

Dockerfile

@@ -2,7 +2,7 @@ FROM predixadoption/edge-pycdp3:1.0.0
 
 LABEL maintainer="Predix Builder Relations"
 LABEL org="https://hub.docker.com/u/predixadoption"
-LABEL version="1.0.34"
+LABEL version="1.0.35"
 LABEL support="https://forum.predix.io"
 LABEL license="https://github.com/PredixDev/predix-docker-samples/blob/master/LICENSE.md"
 

docker-compose-edge-broker.yml

@@ -5,7 +5,8 @@ version: '3'
 
 services:
   predix-edge-broker:
-    image: "dtr.predix.io/predix-edge/predix-edge-mosquitto-amd64:latest"
+    image: "dtr.predix.io/predix-edge/predix-edge-broker:amd64-1.0.2"
+    hostname: 127.0.0.1
     networks:
       - net
     ports:

docker-compose-local.yml

@@ -5,7 +5,7 @@ version: '3'
 
 services:
   edge-hello-world:
-    image: "predixadoption/edge-hello-world:{EDGE_HELLOWORLD_VERSION}"
+    image: "predixadoption/edge-hello-world:latest"
     environment:
       - UPDATE_RATE_SEC=1.0
       - TURBINE_IN_CHANNEL=turbine_control

scripts/quickstart-deploy-to-edgeos.sh

@@ -5,7 +5,8 @@ set -e
 trap "trap_ctrlc" 2
 
 ROOT_DIR=$(pwd)
-SKIP_BROWSER="0"
+logDir="$ROOT_DIR/predix-scripts/log"
+BUILD_APP=false
 function local_read_args() {
   while (( "$#" )); do
   opt="$1"
@@ -20,8 +21,10 @@ function local_read_args() {
       QUICKSTART_ARGS+=" $1 $2"
       shift
     ;;
+    --build-app)
+      BUILD_APP=true
+    ;;
     -o|--override)
-      RECREATE_TAR="1"
       QUICKSTART_ARGS=" $SCRIPT"
     ;;
     --skip-setup)
@@ -44,22 +47,27 @@ function local_read_args() {
 BRANCH="master"
 PRINT_USAGE=0
 SKIP_SETUP=false
+
+IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/master/izon2.sh"
 #ASSET_MODEL="-amrmd predix-ui-seed/server/sample-data/predix-asset/asset-model-metadata.json predix-ui-seed/server/sample-data/predix-asset/asset-model.json"
-SCRIPT="-script edge-starter-deploy.sh -script-readargs edge-starter-deploy-readargs.sh -deploy-edge-app"
-QUICKSTART_ARGS=" $SCRIPT"
+REPO_NAME="wind-workbench"
+DOCKER_STACK_NAME="edge-hello-world"
+SCRIPT="-script edge-starter-deploy.sh -script-readargs edge-starter-deploy-readargs.sh"
+QUICKSTART_ARGS=" $SCRIPT -create-packages -deploy-edge-app -repo-name $REPO_NAME -app-name $DOCKER_STACK_NAME"
 VERSION_JSON="version.json"
 PREDIX_SCRIPTS="predix-scripts"
-REPO_NAME="wind-workbench"
 VERSION_JSON="version.json"
 APP_DIR="edge-hello-world"
 APP_NAME="Edge Starter Hello World"
+GITHUB_RAW="https://raw.githubusercontent.com/PredixDev"
+
 TOOLS="Docker, Git"
 TOOLS_SWITCHES="--docker --git"
 
+# Process switches
 local_read_args $@
-IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/$BRANCH/izon.sh"
-VERSION_JSON_URL=https://raw.githubusercontent.com/PredixDev/$REPO_NAME/$BRANCH/version.json
 
+VERSION_JSON_URL="$GITHUB_RAW/$REPO_NAME/$BRANCH/version.json"
 
 function check_internet() {
   set +e
@@ -112,14 +120,10 @@ getPredixScripts
 #clone the repo itself if running from oneclick script
 pwd
 ls -lrt
-#if [[ ! -d "$PREDIX_SCRIPTS/$REPO_NAME" ]]; then
-#  echo "repo not present"
-getCurrentRepo
-#fi
+
 echo "pwd after copy -> $(pwd)"
-ls -lrt
 echo "quickstart_args=$QUICKSTART_ARGS"
-source $PREDIX_SCRIPTS/bash/quickstart.sh $QUICKSTART_ARGS -repo-name $REPO_NAME -app-name $APP_DIR
+source $PREDIX_SCRIPTS/bash/quickstart.sh $QUICKSTART_ARGS
 
 sleep 20
 # Automagically open the application in browser, based on OS
@@ -142,4 +146,10 @@ if [[ $SKIP_BROWSER == 0 ]]; then
   esac
 fi
 
-echo "Deployed Predix Edge Hello World Application to Predix Edge OS."
+echo "" >> $SUMMARY_TEXTFILE
+echo "Deployed Predix Edge Hello World Application to Predix Edge OS." >> $SUMMARY_TEXTFILE
+echo "Edge Hello world URL: http://$IP_ADDRESS:9098" >> $SUMMARY_TEXTFILE
+echo "" >> $SUMMARY_TEXTFILE
+
+cat $SUMMARY_TEXTFILE
+echo "......................................Done......................................"

scripts/quickstart-wind-workbench.sh

@@ -125,21 +125,21 @@ ls -lrt
 getCurrentRepo
 #fi
 
-echo "pwd after copy -> $(pwd)"
+#echo "pwd after copy -> $(pwd)"
 echo "quickstart_args=$QUICKSTART_ARGS"
 cd $PREDIX_SCRIPTS/$REPO_NAME
-dockerVersion=$(grep version Dockerfile | awk -F"=" '{print $2}' | tr -d "\"")
-echo "$dockerVersion"
-sed "s#{EDGE_HELLOWORLD_VERSION}#$dockerVersion#" docker-compose-local.yml > $(pwd)/docker-compose-local.yml.tmp
-mv $(pwd)/docker-compose-local.yml.tmp $(pwd)/docker-compose-local.yml
+#dockerVersion=$(grep version Dockerfile | awk -F"=" '{print $2}' | tr -d "\"")
+#echo "$dockerVersion"
+#sed "s#{EDGE_HELLOWORLD_VERSION}#$dockerVersion#" docker-compose-local.yml > $(pwd)/docker-compose-local.yml.tmp
+#mv $(pwd)/docker-compose-local.yml.tmp $(pwd)/docker-compose-local.yml
 
-sed "s#{EDGE_HELLOWORLD_VERSION}#$dockerVersion#" docker-compose.yml > $(pwd)/docker-compose.yml.tmp
-mv $(pwd)/docker-compose.yml.tmp $(pwd)/docker-compose.yml
+#sed "s#{EDGE_HELLOWORLD_VERSION}#$dockerVersion#" docker-compose.yml > $(pwd)/docker-compose.yml.tmp
+#mv $(pwd)/docker-compose.yml.tmp $(pwd)/docker-compose.yml
 
 if [[ "$BUILD_APP" == "true" ]]; then
-  docker build  --no-cache -t "predixadoption/edge-hello-world:$dockerVersion" -f ./Dockerfile . --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy
-else
-  docker pull predixadoption/edge-hello-world:$dockerVersion
+  docker build  --no-cache -t "predixadoption/edge-hello-world:latest" -f ./Dockerfile . --build-arg http_proxy --build-arg https_proxy --build-arg no_proxy
+#else
+#  docker pull predixadoption/edge-hello-world:$dockerVersion
 fi
 cd ../..
 

version.json

@@ -1,11 +1,12 @@
 {
   "name": "Wind Workbench",
-  "version": "1.0.34",
+  "version": "1.0.35",
   "private": false,
   "dependencies": {
     "local-setup": "https://github.com/PredixDev/local-setup#1.0.101",
-    "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.182",
-    "wind-workbench": "https://github.com/PredixDev/wind-workbench#1.0.34"
+    "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.183",
+    "wind-workbench": "https://github.com/PredixDev/wind-workbench#1.0.35",
+    "predix-edge-broker": "https://artifactory.predix.io/artifactory/PREDIX-EXT/predix-edge/2_1_0/os/predix-edge-broker-amd64-20180917-1.0.2.tar.gz#"
   },
   "author": "susheelchoudhari"
 }