Skip to content

Commit 6047bb8

Browse files
committed
fieldbus node install dir changed to /usr/lib/node_modules
1 parent 8a89978 commit 6047bb8

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

Dockerfile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
1414
RUN [ "cross-build-start" ]
1515

1616
#version
17-
ENV HILSCHERNETPI_NODERED_FB_VERSION 1.0.5
17+
ENV HILSCHERNETPI_NODERED_FB_VERSION 1.0.6
1818

1919
#labeling
2020
LABEL maintainer="netpi@hilscher.com" \
@@ -32,7 +32,7 @@ RUN apt-get update \
3232
&& curl -sL https://deb.nodesource.com/setup_8.x | sudo -E bash - \
3333
&& apt-get install -y nodejs \
3434
#install Node-RED
35-
&& npm install -g --unsafe-perm node-red \
35+
&& npm install -g --unsafe-perm node-red@0.20.8 \
3636
#install netx driver
3737
&& dpkg -i /tmp/netx-docker-pi-drv-1.1.3.deb \
3838
#compile program checking whether we are running on netPI RTE 3 or on Pi with NHAT 52-RTE
@@ -51,15 +51,15 @@ RUN apt-get update \
5151
#install fieldbus nodes
5252
&& mkdir /root/.node-red \
5353
&& mv /tmp/fieldbusSettings.json /root/.node-red \
54-
&& mkdir -p /root/.node-red/node_modules/fieldbus/lib \
55-
&& mv /tmp/10-fieldbus.html /tmp/10-fieldbus.js /tmp/package.json -t /root/.node-red/node_modules/fieldbus \
56-
&& mv /tmp/fieldbusConnectionPool.js /tmp/fieldbusHandler.js /tmp/HilscherLog.js /tmp/HilscherToolBox.js /root/.node-red/node_modules/fieldbus/lib \
57-
&& cd /root/.node-red/node_modules/fieldbus \
54+
&& mkdir -p /usr/lib/node_modules/fieldbus/lib \
55+
&& mv /tmp/10-fieldbus.html /tmp/10-fieldbus.js /tmp/package.json -t /usr/lib/node_modules/fieldbus \
56+
&& mv /tmp/fieldbusConnectionPool.js /tmp/fieldbusHandler.js /tmp/HilscherLog.js /tmp/HilscherToolBox.js /usr/lib/node_modules/fieldbus/lib \
57+
&& cd /usr/lib/node_modules/fieldbus \
5858
&& npm install \
5959
&& cd /root/.node-red \
6060
&& npm rebuild \
6161
#install fieldbus nodes wrapper library and generate needed libboost V1.61.0 links
62-
&& mv /tmp/fieldbus.node /root/.node-red/node_modules/fieldbus/lib \
62+
&& mv /tmp/fieldbus.node /usr/lib/node_modules/fieldbus/lib \
6363
&& ln -s /usr/lib/arm-linux-gnueabihf/libboost_filesystem.so.1.62.0 /usr/lib/arm-linux-gnueabihf/libboost_filesystem.so.1.61.0 \
6464
&& ln -s /usr/lib/arm-linux-gnueabihf/libboost_system.so.1.62.0 /usr/lib/arm-linux-gnueabihf/libboost_system.so.1.61.0 \
6565
#install netx firmwares from zip

0 commit comments

Comments
 (0)