Skip to content

Commit

Permalink
Release 1.0.16
Browse files Browse the repository at this point in the history
  • Loading branch information
predix-adoption-bot committed Jan 29, 2019
1 parent 4cd11b5 commit 37ee9b3
Show file tree
Hide file tree
Showing 8 changed files with 15 additions and 76 deletions.
1 change: 1 addition & 0 deletions COPYRIGHT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The dependencies in this project are resolved by Maven pom.xml and package.json. Copyrights from those projects are included [here](http://predixdev.github.io/rmd-ref-app-copyright/). This list may be a superset of projects actually referenced by this project.
3 changes: 2 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM node:10-alpine
LABEL maintainer="Predix Builder Relations"
LABEL hub="https://hub.docker.com"
LABEL org="https://hub.docker.com/u/predixadoption"
LABEL version="1.0.15"
LABEL version="1.0.16"
LABEL support="https://forum.predix.io"
LABEL license="https://github.com/PredixDev/predix-docker-samples/blob/master/LICENSE.md"

Expand All @@ -27,6 +27,7 @@ RUN node -v

RUN npm cache clean --force
RUN npm install
RUN npm install [email protected]
RUN bower install --allow-root
# RUN gulp dist
RUN ./node_modules/gulp/bin/gulp.js dist
Expand Down
63 changes: 0 additions & 63 deletions config/config-opcua-local.json

This file was deleted.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "edge-ref-app",
"version": "1.0.15",
"version": "1.0.16",
"description": "Predix Edge Reference app with node-red",
"main": "server/app.js",
"directories": {
Expand Down
4 changes: 2 additions & 2 deletions scripts/quickstart-edge-ref-app-edgeos.sh
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,10 @@ source $PREDIX_SCRIPTS/bash/quickstart.sh $QUICKSTART_ARGS

echo "sleep 20 seconds"
sleep 20
echo "Open in Browser at http://$IP_ADDRESS:5000"
echo "Open in Browser at http://$DEVICE_IP_ADDRESS:5000"
# Automagically open the application in browser, based on OS
if [[ $SKIP_BROWSER == 0 ]]; then
app_url="http://$IP_ADDRESS:5000"
app_url="http://$DEVICE_IP_ADDRESS:5000"

case "$(uname -s)" in
Darwin)
Expand Down
6 changes: 3 additions & 3 deletions scripts/quickstart-edge-ref-app-em.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ SKIP_SETUP=false
REPO_NAME=predix-edge-ref-app
IZON_SH="https://raw.githubusercontent.com/PredixDev/izon/1.2.0/izon2.sh"
SCRIPT="-script edge-manager.sh -script-readargs edge-manager-readargs.sh"
QUICKSTART_ARGS="$QUICKSTART_ARGS --create-packages --create-application --create-configuration --create-device --enroll-device -edge-app-name $REPO_NAME -asset-name Compressor-CMMS-Compressor-2018 $SCRIPT"
QUICKSTART_ARGS="$QUICKSTART_ARGS --create-packages --create-application --create-configuration --create-device -edge-app-name $REPO_NAME -asset-name Compressor-CMMS-Compressor-2018 $SCRIPT"
VERSION_JSON="version.json"
PREDIX_SCRIPTS=predix-scripts

Expand Down Expand Up @@ -140,9 +140,9 @@ fi

echo "Created Device $DEVICE_ID in Edge Manager and uploaded the Edge Application and Configuration to repository in Edge Manager."
echo "Your Edge Manager url is https://$EM_TENANT_ID.edgemanager.run.aws-usw02-pr.ice.predix.io"
echo "Next, go to Predix Edge Technician Console and Enroll the Edge OS with Edge Manager. You can access the Predix Edge Technician Console at https://$IP_ADDRESS"
echo "Next, go to Predix Edge Technician Console and Enroll the Edge OS with Edge Manager. You can access the Predix Edge Technician Console at https://$DEVICE_IP_ADDRESS"
echo "Then deploy the Applcation and Configuration to Edge OS."
echo "Once the deployment of application and configuration is successfull, Open in Browser at https://$IP_ADDRESS:5000"
echo "Once the deployment of application and configuration is successfull, Open in Browser at https://$DEVICE_IP_ADDRESS:5000"

cat $SUMMARY_TEXTFILE
__append_new_line_log "" "$logDir"
Expand Down
10 changes: 5 additions & 5 deletions version.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "Edge Ref App",
"version": "1.0.15",
"version": "1.0.16",
"private": true,
"dependencies": {
"local-setup": "https://github.com/PredixDev/local-setup#1.0.103",
"predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.214",
"predix-webapp-starter": "https://github.com/PredixDev/predix-webapp-starter.git#2.0.64",
"predix-edge-ref-app": "https://github.com/PredixDev/predix-edge-ref-app.git#1.0.15",
"local-setup": "https://github.com/PredixDev/local-setup#1.0.106",
"predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.219",
"predix-webapp-starter": "https://github.com/PredixDev/predix-webapp-starter.git#2.0.69",
"predix-edge-ref-app": "https://github.com/PredixDev/predix-edge-ref-app.git#1.0.16",
"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_timeseries": "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#"
Expand Down

0 comments on commit 37ee9b3

Please sign in to comment.