Release 1.0.5

Author: predix-adoption-bot

Dockerfile

@@ -8,7 +8,7 @@ LABEL maintainer="Predix Edge Adoption"
 LABEL hub="https://hub.docker.com"
 LABEL org="https://hub.docker.com/u/predixedge"
 LABEL repo="predix-edge-sample-scaler-python"
-LABEL version="1.0.4"
+LABEL version="1.0.5"
 LABEL support="https://forum.predix.io"
 LABEL license="https://github.com/PredixDev/predix-docker-samples/blob/master/LICENSE.md"
 

README.md

@@ -137,6 +137,38 @@ Feb 28 03:23:52 predixedge b35f5fc9ed5b[319]: {"messageId":"flex-pipe","body":[{
 
 ## Running Locally in Docker
 
+### Automated set up
+
+If you are not aware of the intricacies of downloading the application on your computer, configuring an Edge Application, and creating a Cloud app, you can run the Quickstart script.
+
+If using the Optional Cloud switch, you will see the Time Series data, sent from the edge, in a Cloud web application with a chart.  
+
+The script will:
+
+- Offer to install tools you will need
+- Use Git to download the Edge Application, build it and get it running locally with all the dependencies
+- Create UAA and Time Series and set up the security in the cloud (optional)
+- Upload a cloud web application to display the Time Series data sent from the edge (optional)
+- Set up Cloud security for the Edge Application (optional)
+
+The manual steps for Edge are in the Manual Set Up section below.  (The cloud manual steps are not listed and require the script to run)
+
+For DevBox, Mac and Linux
+
+If you have a Predix Cloud account with an org/space:
+
+```bash
+bash <( curl https://raw.githubusercontent.com/PredixDev/predix-edge-sample-scaler-python/master/scripts/quickstart-edge-starter-sample-app.sh )
+```
+
+If you do not have a Predix Cloud account with an org/space run this.  The Time Series data will not leave the Edge Ref App and you will not be able to see it in a cloud application.
+
+```bash
+bash <( curl https://raw.githubusercontent.com/PredixDev/predix-edge-sample-scaler-python/master/scripts/quickstart-edge-starter-sample-app.sh ) --skip-predix-services
+```
+
+### Manual Set Up
+
 ### Software You will Need
 
 In order to develop and run this sample locally you will need:

docker-compose-local.yml

@@ -37,7 +37,7 @@ services:
       - predix-edge-broker_net
 
   edge-app:
-    image: "predixedge/predix-edge-sample-scaler-python:1.0.4"
+    image: "predixedge/predix-edge-sample-scaler-python:1.0.5"
     environment:
       - PYTHONUNBUFFERED=0 # To shows print statements in docker logs
       - BROKER=predix-edge-broker

docker-compose.yml

@@ -24,7 +24,7 @@ services:
     networks:
       - predix-edge-broker_net
   edge-app:
-    image: "predixedge/predix-edge-sample-scaler-python:1.0.4"
+    image: "predixedge/predix-edge-sample-scaler-python:1.0.5"
     environment:
       - PYTHONUNBUFFERED=0 # To shows print statements in docker logs
       - BROKER=predix-edge-broker

setup.py

@@ -11,7 +11,7 @@
 
 setup(
         name='predix-edge-sample-scaler-python',
-        version='1.0.4',
+        version='1.0.5',
         description='Predix Edge Sample Python App',
         long_description=long_description,
         install_requires=install_requires,

version.json

@@ -1,12 +1,12 @@
 {
   "name": "Predix Edge Sample Scaler Python",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "private": true,
   "dependencies": {
     "local-setup": "https://github.com/PredixDev/local-setup#1.0.106",
-    "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.241",
+    "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.242",
     "predix-webapp-starter": "https://github.com/PredixDev/predix-webapp-starter.git#2.0.92",
-    "predix-edge-sample-scaler-python": "https://github.com/PredixDev/predix-edge-sample-scaler-python.git#1.0.4",
+    "predix-edge-sample-scaler-python": "https://github.com/PredixDev/predix-edge-sample-scaler-python.git#1.0.5",
     "opcua": "https://artifactory.predix.io/artifactory/PREDIX-EXT/predix-edge/2_1_0/apps/adapters/predix-edge-opc-ua-adapter-amd64-20181002-1.1.0.tar.gz#",
     "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#",
     "cloud_gateway": "https://artifactory.predix.io/artifactory/PREDIX-EXT/predix-edge/2_1_0/apps/gateway/predix-edge-cloud-gateway-amd64-20181002-1.1.0.tar.gz#"