Skip to content

Commit

Permalink
fieldbus node install dir changed to /usr/lib/node_modules
Browse files Browse the repository at this point in the history
  • Loading branch information
hilschernetpi committed Oct 7, 2019
1 parent 8a89978 commit 6047bb8
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LABEL org.label-schema.build-date=$BUILD_DATE \
RUN [ "cross-build-start" ]

#version
ENV HILSCHERNETPI_NODERED_FB_VERSION 1.0.5
ENV HILSCHERNETPI_NODERED_FB_VERSION 1.0.6

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

0 comments on commit 6047bb8

Please sign in to comment.