Release 1.0.50

PredixDev · Mar 23, 2019 · f4a65ec · f4a65ec
1 parent 9492ca2
commit f4a65ec
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 53 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,7 +5,7 @@ LABEL maintainer="Predix Builder Relations"
 LABEL hub="https://hub.docker.com"
 LABEL org="https://hub.docker.com/u/predixedge"
 LABEL repo="predix-edge-ref-app"
-LABEL version="1.0.47"
+LABEL version="1.0.50"
 LABEL support="https://forum.predix.io"
 LABEL license="https://github.com/PredixDev/predix-docker-samples/blob/master/LICENSE.md"
 

diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml
@@ -23,6 +23,11 @@ services:
     image: "dtr.predix.io/predix-edge/cloud-gateway:amd64-1.1.0"
     environment:
       config: "/config/config-cloud-gateway.json"
+      http_proxy: ${http_proxy}
+      https_proxy: ${https_proxy}
+      HTTP_PROXY: ${HTTP_PROXY}
+      HTTPS_PROXY: ${HTTP_PROXY}
+      no_proxy: ${no_proxy}      
     volumes:
       - ./config:/config
       - ./data:/data

diff --git a/docker-compose-local.yml b/docker-compose-local.yml
@@ -24,6 +24,11 @@ services:
     image: "dtr.predix.io/predix-edge/cloud-gateway:amd64-1.1.0"
     environment:
       config: "/config/config-cloud-gateway.json"
+      http_proxy: ${http_proxy}
+      https_proxy: ${https_proxy}
+      HTTP_PROXY: ${HTTP_PROXY}
+      HTTPS_PROXY: ${HTTP_PROXY}
+      no_proxy: ${no_proxy}
     volumes:
       - ./config:/config
       - ./data:/data
@@ -40,7 +45,7 @@ services:
     ports:
       - 1880:1880
   predix-edge-ref-app:
-    image: "predixedge/predix-edge-ref-app:1.0.47"
+    image: "predixedge/predix-edge-ref-app:1.0.50"
     volumes:
       - ./config:/config
       - ./data:/data

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
     ports:
       - 1880:1880
   predix-edge-ref-app:
-    image: "predixedge/predix-edge-ref-app:1.0.47"
+    image: "predixedge/predix-edge-ref-app:1.0.50"
     networks:
       - predix-edge-broker_net
     ports:

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "edge-ref-app",
-  "version": "1.0.47",
+  "version": "1.0.50",
   "description": "Predix Edge Reference app with node-red",
   "main": "server/app.js",
   "directories": {

diff --git a/scripts/build-docker.sh b/scripts/build-docker.sh
diff --git a/scripts/get-access-token.sh b/scripts/get-access-token.sh
@@ -1,9 +1,12 @@
 # get command line paramaters
+
+set -e
+
 CLIENT_ID=$1
 SECRET=$2
 UAA_URL=$3
 
-echo "usage: get-access-token.sh <clientId> <secret> <uaa-issuerid-url>"
+echo "usage: createAccessTokenFile <clientId> <secret> <uaa-issuerid-url>"
 
 # base64 encide the client and secret
 AUTH='Authorization: Basic '$(echo -n $CLIENT_ID:$SECRET | base64)
@@ -12,9 +15,20 @@ AUTH='Authorization: Basic '$(echo -n $CLIENT_ID:$SECRET | base64)
 RESULT=$(curl -X POST $UAA_URL  -H "$AUTH" -H 'Content-Type: application/x-www-form-urlencoded' -d grant_type=client_credentials)
 
 # parse out the access token from the result - this requires jq to be installed on your machine (brew install jq)
-ACCESS_TOKEN=$( echo "$RESULT" | jq -r '.["access_token"]' )
-
-# copy the access token to the access_token file in the data folder of your app - where the Cloud Gateway container will look for it
-printf "%s" "$ACCESS_TOKEN" > ./data/access_token
-
-echo 'token refreshed'
+if [[ $( echo "$RESULT" | jq 'has("access_token")') == true ]]; then
+  ACCESS_TOKEN=$( echo "$RESULT" | jq -r '.["access_token"]' )
+  # copy the access token to the access_token file in the data folder of your app - where the Cloud Gateway container will look for it
+  mkdir -p ./data
+  printf "%s" "$ACCESS_TOKEN" > ./data/access_token
+  chmod -R 777 data
+  echo 'token refreshed'
+else
+  echo "Coult not fetch token : $RESULT"
+  echo "Please check if the paramters passed are correct"
+  echo "$CLIENT_ID $SECRET $UAA_URL"
+  echo "CURL COMAND : curl -X POST $UAA_URL  -H "$AUTH" -H 'Content-Type: application/x-www-form-urlencoded' -d grant_type=client_credentials"
+  mkdir -p ./data
+  printf "%s" "" > ./data/access_token
+  chmod -R 777 data
+  exit 1
+fi
diff --git a/scripts/pullimages.sh b/scripts/pullimages.sh
diff --git a/version.json b/version.json
@@ -1,12 +1,12 @@
 {
   "name": "Edge Ref App",
-  "version": "1.0.47",
+  "version": "1.0.50",
   "private": true,
   "dependencies": {
-    "local-setup": "https://github.com/PredixDev/local-setup#1.0.106",
-    "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.240",
-    "predix-webapp-starter": "https://github.com/PredixDev/predix-webapp-starter.git#2.0.90",
-    "predix-edge-ref-app": "https://github.com/PredixDev/predix-edge-ref-app.git#1.0.47",
+    "local-setup": "https://github.com/PredixDev/local-setup#1.0.107",
+    "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.246",
+    "predix-webapp-starter": "https://github.com/PredixDev/predix-webapp-starter.git#2.0.92",
+    "predix-edge-ref-app": "https://github.com/PredixDev/predix-edge-ref-app.git#1.0.50",
     "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#",
     "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#",
     "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#"