diff --git a/Dockerfile b/Dockerfile index 6f70be6..fc32bca 100644 --- 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/predixadoption" LABEL repo="predix-edge-ref-app" -LABEL version="1.0.32" +LABEL version="1.0.34" LABEL support="https://forum.predix.io" LABEL license="https://github.com/PredixDev/predix-docker-samples/blob/master/LICENSE.md" diff --git a/README.md b/README.md index ced8ffd..62107f3 100644 --- a/README.md +++ b/README.md @@ -271,21 +271,28 @@ Next build the docker image: This command uses the Dockerfile to create the docker container so it can be uploaded to Docker Hub. If you are behind a corporate proxy server, use the proxy switches or remove them if not needed for your situation. +Now log in to the Docker Hub. Create a dockerhub account if you do not have one. [Docker Hub Signup](https://hub.docker.com/signup) + ```sh -docker build --no-cache -t predixadoption/predix-edge-ref-app:latest --build-arg https_proxy --build-arg no_proxy= --build-arg http_proxy . +docker login -u -p ``` -Now log in to the Docker Hub: +Build predix-edge-ref-app docker image using proxy. Your Docker Organization is usually your username. ```sh -docker login ??? +docker build --no-cache -t /predix-edge-ref-app:latest --build-arg https_proxy --build-arg no_proxy= --build-arg http_proxy . ``` +Build predix-edge-ref-app docker image without proxy. + +```sh +docker build --no-cache -t /predix-edge-ref-app:latest . +``` Now Push the docker image to the Docker Hub. ```sh -docker push ??? +docker push /predix-edge-ref-app:latest ``` [![Analytics](https://predix-beacon.appspot.com/UA-82773213-1/predix-edge-ref-app/readme?pixel)](https://github.com/PredixDev) diff --git a/config/app-deadband/predix-edge-ref-app-app-deadband-config.zip b/config/app-deadband/predix-edge-ref-app-app-deadband-config.zip index 7b6be4b..f98ed24 100644 Binary files a/config/app-deadband/predix-edge-ref-app-app-deadband-config.zip and b/config/app-deadband/predix-edge-ref-app-app-deadband-config.zip differ diff --git a/docker-compose-local.yml b/docker-compose-local.yml index c284916..e52579b 100644 --- a/docker-compose-local.yml +++ b/docker-compose-local.yml @@ -40,7 +40,7 @@ services: ports: - 1880:1880 predix-edge-ref-app: - image: "predixadoption/predix-edge-ref-app:1.0.32" + image: "predixadoption/predix-edge-ref-app:1.0.34" volumes: - ./config:/config - ./data:/data diff --git a/docker-compose.yml b/docker-compose.yml index b003613..9440f07 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: ports: - 1880:1880 predix-edge-ref-app: - image: "predixadoption/predix-edge-ref-app:1.0.32" + image: "predixadoption/predix-edge-ref-app:1.0.34" networks: - predix-edge-broker_net ports: diff --git a/package-lock.json b/package-lock.json index 04791b8..6656881 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "edge-ref-app", - "version": "1.0.32", + "version": "1.0.34", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 35a1c7c..6a9177d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "edge-ref-app", - "version": "1.0.32", + "version": "1.0.34", "description": "Predix Edge Reference app with node-red", "main": "server/app.js", "directories": { diff --git a/scripts/config-for-flow.sh b/scripts/config-for-flow.sh index af037da..a0a30ec 100755 --- a/scripts/config-for-flow.sh +++ b/scripts/config-for-flow.sh @@ -16,4 +16,18 @@ cp ../config-opcua.json . cp ../config-simulator.json . cp flows-$1.json flows.json rm -f predix-edge-ref-app-$1-config.zip -zip -X -r predix-edge-ref-app-$1-config.zip * -x .. + +extensions='' +#no extensions +for file in `find . -type f -depth 1 ! -name '*.*' | grep -v '\./\.' | sed 's|\./||' | sort -u`; do + echo "file=$file" + extensions="$extensions $file" +done +#files with extensions +for extension in `find . -type f -depth 1 -name '*.*' | grep -v '\./\.' | sed 's|.*\.||' | sort -u`; do + echo "extension=$extension" + extensions="$extensions *.$extension" +done +echo $extensions +zip -X -r ../$APP_NAME_CONFIG $extensions +zip -X -r predix-edge-ref-app-$1-config.zip $extensions diff --git a/scripts/quickstart-edge-ref-app-em.sh b/scripts/quickstart-edge-ref-app-em.sh index 774c3db..db514f0 100755 --- a/scripts/quickstart-edge-ref-app-em.sh +++ b/scripts/quickstart-edge-ref-app-em.sh @@ -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 --upload-application --create-configuration --create-device -edge-app-name $REPO_NAME -asset-name Compressor-CMMS-Compressor-2018 $SCRIPT" +QUICKSTART_ARGS="$QUICKSTART_ARGS --create-packages --upload-application --upload-configuration --create-device -edge-app-name $REPO_NAME -asset-name Compressor-CMMS-Compressor-2018 $SCRIPT" VERSION_JSON="version.json" PREDIX_SCRIPTS=predix-scripts diff --git a/version.json b/version.json index 6f0eadc..dd15957 100644 --- a/version.json +++ b/version.json @@ -1,12 +1,12 @@ { "name": "Edge Ref App", - "version": "1.0.32", + "version": "1.0.34", "private": true, "dependencies": { "local-setup": "https://github.com/PredixDev/local-setup#1.0.106", - "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.223", + "predix-scripts": "https://github.com/PredixDev/predix-scripts#1.1.224", "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.32", + "predix-edge-ref-app": "https://github.com/PredixDev/predix-edge-ref-app.git#1.0.34", "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#"