node-red update to 1.2.9, added analog input node

HilscherAutomation · Feb 10, 2021 · 853f0af · 853f0af
1 parent 3317380
commit 853f0af
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -41,7 +41,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
       org.label-schema.vcs-ref=$VCS_REF
 
 #version
-ENV HILSCHERNETPI_NODERED_VERSION 1.7.0
+ENV HILSCHERNETPI_NODERED_VERSION 1.7.1
 
 #labeling
 LABEL maintainer="netpi@hilscher.com" \
@@ -67,9 +67,9 @@ ARG NPIX_LEDS_NODE=netPI-nodered-npix-leds
 ARG NPIX_LEDS_NODE_VERSION=1.0.0
 ARG NPIX_LEDS_NODE_DIR=/tmp/${NPIX_LEDS_NODE}-${NPIX_LEDS_NODE_VERSION}
 
-#ARG NPIX_AI_NODE=netPI-nodered-npix-ai
-#ARG NPIX_AI_NODE_VERSION=1.1.0
-#ARG NPIX_AI_NODE_DIR=/tmp/${NPIX_AI_NODE}-${NPIX_AI_NODE_VERSION}
+ARG NPIX_AI_NODE=netPI-nodered-npix-ai
+ARG NPIX_AI_NODE_VERSION=1.2.0
+ARG NPIX_AI_NODE_DIR=/tmp/${NPIX_AI_NODE}-${NPIX_AI_NODE_VERSION}
 
 ARG NPIX_IO_NODE=netPI-nodered-npix-io
 ARG NPIX_IO_NODE_VERSION=1.1.0
@@ -79,20 +79,20 @@ RUN curl https://codeload.github.com/HilscherAutomation/${FIELDBUS_NODE}/tar.gz/
  && curl https://codeload.github.com/HilscherAutomation/${FRAM_NODE}/tar.gz/${FRAM_NODE_VERSION} -o /tmp/${FRAM_NODE} \
  && curl https://codeload.github.com/HilscherAutomation/${USER_LEDS_NODE}/tar.gz/${USER_LEDS_NODE_VERSION} -o /tmp/${USER_LEDS_NODE} \
  && curl https://codeload.github.com/HilscherAutomation/${NPIX_LEDS_NODE}/tar.gz/${NPIX_LEDS_NODE_VERSION} -o /tmp/${NPIX_LEDS_NODE} \
-# && curl https://codeload.github.com/HilscherAutomation/${NPIX_AI_NODE}/tar.gz/${NPIX_AI_NODE_VERSION} -o /tmp/${NPIX_AI_NODE} \
+ && curl https://codeload.github.com/HilscherAutomation/${NPIX_AI_NODE}/tar.gz/${NPIX_AI_NODE_VERSION} -o /tmp/${NPIX_AI_NODE} \
  && curl https://codeload.github.com/HilscherAutomation/${NPIX_IO_NODE}/tar.gz/${NPIX_IO_NODE_VERSION} -o /tmp/${NPIX_IO_NODE} \
  && tar -xvf /tmp/${FIELDBUS_NODE} -C /tmp/ \
  && tar -xvf /tmp/${FRAM_NODE} -C /tmp/ \
  && tar -xvf /tmp/${USER_LEDS_NODE} -C /tmp/ \
-# && tar -xvf /tmp/${NPIX_AI_NODE} -C /tmp/ \
+ && tar -xvf /tmp/${NPIX_AI_NODE} -C /tmp/ \
  && tar -xvf /tmp/${NPIX_IO_NODE} -C /tmp/ \
  && tar -xvf /tmp/${NPIX_LEDS_NODE} -C /tmp/ \
 # -------------------- Install nodejs and Node-RED --------------------------------------
 #install node.js V12.x.x and Node-RED 1.x.x
  && apt-get update && apt-get install build-essential python-dev python-pip python-setuptools git \
  && curl -sL https://deb.nodesource.com/setup_12.x | sudo -E bash -  \
  && apt-get install -y nodejs \
- && npm install -g --unsafe-perm node-red@1.2.2 \
+ && npm install -g --unsafe-perm node-red@1.2.9 \
  && npm config set package-lock false \
 #enable https security and make certificates known
  && sed -i -e "s+//  key: require(\"fs\").readFileSync('privkey.pem'),+https: {\n    key: require(\"fs\").readFileSync('/root/.node-red/certs/node-key.pem'),+" /usr/lib/node_modules/node-red/settings.js \
@@ -194,16 +194,16 @@ RUN curl https://codeload.github.com/HilscherAutomation/${FIELDBUS_NODE}/tar.gz/
  && cd /usr/lib/node_modules_tmp/node-red-contrib-npix-leds \
  && npm install \
 # -------------------- Install NPIX 4AI16U nodes and all dependencies --------------------
-# && mkdir /usr/lib/node_modules_tmp/node-red-contrib-npix-ai \
-# && mv ${NPIX_AI_NODE_DIR}/node-red-contrib-npix-ai/npixai.js \ 
-#    ${NPIX_AI_NODE_DIR}/node-red-contrib-npix-ai/npixai.html \
-#    ${NPIX_AI_NODE_DIR}/node-red-contrib-npix-ai/package.json \
-#    -t /usr/lib/node_modules_tmp/node-red-contrib-npix-ai \
-# && cd /usr/lib/node_modules_tmp/node-red-contrib-npix-ai \
-# && npm install \
-# && git clone https://github.com/jaycetde/node-ads1x15 /usr/lib/node_modules_tmp/node-red-contrib-npix-ai/node_modules/node-ads1x15 \
-# && cd /usr/lib/node_modules_tmp/node-red-contrib-npix-ai/node_modules/node-ads1x15 \
-# && npm install \
+ && mkdir /usr/lib/node_modules_tmp/node-red-contrib-npix-ai \
+ && mv ${NPIX_AI_NODE_DIR}/node-red-contrib-npix-ai/npixai.js \ 
+    ${NPIX_AI_NODE_DIR}/node-red-contrib-npix-ai/npixai.html \
+    ${NPIX_AI_NODE_DIR}/node-red-contrib-npix-ai/package.json \
+    -t /usr/lib/node_modules_tmp/node-red-contrib-npix-ai \
+ && cd /usr/lib/node_modules_tmp/node-red-contrib-npix-ai \
+ && npm install \
+ && git clone https://github.com/hilschernetpi/node-ads1x15 /usr/lib/node_modules_tmp/node-red-contrib-npix-ai/node_modules/node-ads1x15 \
+ && cd /usr/lib/node_modules_tmp/node-red-contrib-npix-ai/node_modules/node-ads1x15 \
+ && npm install \
 # -------------------- Install NPIX 4DI4DO nodes and all dependencies --------------------
  && mkdir /usr/lib/node_modules_tmp/node-red-contrib-npix-io \
  && mv ${NPIX_IO_NODE_DIR}/node-red-contrib-npix-io/npixio.js \