Skip to content

Commit

Permalink
Release 1.0.34
Browse files Browse the repository at this point in the history
predix-adoption-bot committed Feb 6, 2019
1 parent b7e7151 commit 98bce45
Showing 10 changed files with 35 additions and 14 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -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"

15 changes: 11 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -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 <username> -p <password>
```

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 <Docker Organization>/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 <Docker Organization>/predix-edge-ref-app:latest .
```

Now Push the docker image to the Docker Hub.

```sh
docker push ???
docker push <Docker Organization>/predix-edge-ref-app:latest
```

[![Analytics](https://predix-beacon.appspot.com/UA-82773213-1/predix-edge-ref-app/readme?pixel)](https://github.com/PredixDev)
Binary file modified config/app-deadband/predix-edge-ref-app-app-deadband-config.zip
Binary file not shown.
2 changes: 1 addition & 1 deletion docker-compose-local.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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:
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.32",
"version": "1.0.34",
"description": "Predix Edge Reference app with node-red",
"main": "server/app.js",
"directories": {
16 changes: 15 additions & 1 deletion scripts/config-for-flow.sh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion scripts/quickstart-edge-ref-app-em.sh
Original file line number Diff line number Diff line change
@@ -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

6 changes: 3 additions & 3 deletions version.json
Original file line number Diff line number Diff line change
@@ -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#"

0 comments on commit 98bce45

Please sign in to comment.