Skip to content

Commit e9a241a

Browse files
committed
Test with custom nodered images
1 parent e86cee2 commit e9a241a

7 files changed

Lines changed: 44 additions & 23 deletions

File tree

OpenFlowNodeRED/Dockerfile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
FROM node:lts
22
EXPOSE 80
33
EXPOSE 5859
4+
45
WORKDIR /data
5-
COPY docker-package.json ./package.json
6+
RUN groupadd -r openiapuser && useradd -r -g openiapuser -G audio,video openiapuser \
7+
&& mkdir -p /home/openiapuser/Downloads \
8+
&& chown -R openiapuser:openiapuser /home/openiapuser \
9+
&& chown -R openiapuser:openiapuser /data/
10+
# Run everything after as non-privileged user.
11+
USER openiapuser
12+
13+
COPY --chown=openiapuser:openiapuser docker-package.json ./package.json
614
RUN npm install --only=prod
715
# RUN npm install
8-
COPY dist ./
16+
COPY --chown=openiapuser:openiapuser dist ./
917

1018
ENTRYPOINT ["/usr/local/bin/node", "--inspect=0.0.0.0:5859", "index.js"]
Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
FROM openiap/nodered:edge
2-
EXPOSE 80
3-
EXPOSE 5859
2+
USER root
43
RUN apt-get update \
54
&& apt-get install -y wget gnupg \
65
&& wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
@@ -9,15 +8,6 @@ RUN apt-get update \
98
&& apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \
109
--no-install-recommends \
1110
&& rm -rf /var/lib/apt/lists/*
12-
WORKDIR /data
13-
RUN npm i puppeteer \
14-
# Add user so we don't need --no-sandbox.
15-
# same layer as npm install to keep re-chowned files from using up several hundred MBs more space
16-
&& groupadd -r pptruser && useradd -r -g pptruser -G audio,video pptruser \
17-
&& mkdir -p /home/pptruser/Downloads \
18-
&& chown -R pptruser:pptruser /home/pptruser \
19-
&& chown -R pptruser:pptruser /data/
20-
# Run everything after as non-privileged user.
21-
USER pptruser
2211

12+
USER openiapuser
2313
ENTRYPOINT ["/usr/local/bin/node", "--inspect=0.0.0.0:5859", "index.js"]

OpenFlowNodeRED/Dockerfiletagui

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM openiap/nodered:edge
2+
USER root
3+
RUN apt-get update \
4+
&& apt-get install -y unzip wget gnupg python3-pip python3-venv php \
5+
&& wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
6+
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
7+
&& apt-get update \
8+
&& apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \
9+
--no-install-recommends \
10+
&& rm -rf /var/lib/apt/lists/*
11+
RUN pip3 install rpa
12+
RUN wget -O /tmp/tagui_linux.zip https://github.com/kelaberetiv/TagUI/releases/download/v6.14.0/TagUI_Linux.zip \
13+
&& unzip '/tmp/tagui_linux.zip' -d /home/openiapuser && rm /tmp/tagui_linux.zip || true && mv /home/openiapuser/tagui /home/openiapuser/.tagui && chown -R openiapuser:openiapuser /home/openiapuser
14+
RUN ln -sf /home/openiapuser/.tagui/src/tagui /usr/local/bin/tagui
15+
USER openiapuser
16+
ENTRYPOINT ["/usr/local/bin/node", "--inspect=0.0.0.0:5859", "index.js"]

OpenFlowNodeRED/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@openiap/nodered",
3-
"version": "1.2.95",
3+
"version": "1.2.98",
44
"description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
55
"main": "index.js",
66
"scripts": {

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.95
1+
1.2.98

gulpfile.js

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,12 +192,19 @@ gulp.task("compose", shell.task([
192192
'docker push openiap/nodered-puppeteer:edge',
193193
'docker push openiap/nodered-puppeteer:' + version,
194194

195-
'echo "Build openiap/openflow"',
196-
'docker build -t openiap/openflow:edge .',
197-
'docker tag openiap/openflow:edge openiap/openflow:' + version,
198-
'echo "Push openiap/openflow"',
199-
'docker push openiap/openflow:edge',
200-
'docker push openiap/openflow:' + version
195+
'echo "Build openiap/nodered-tagui"',
196+
'cd OpenFlowNodeRED && docker build -t openiap/nodered-tagui:edge -f Dockerfiletagui .',
197+
'docker tag openiap/nodered-tagui:edge openiap/nodered-tagui:' + version,
198+
'echo "Push openiap/nodered-tagui"',
199+
'docker push openiap/nodered-tagui:edge',
200+
'docker push openiap/nodered-tagui:' + version,
201+
202+
// 'echo "Build openiap/openflow"',
203+
// 'docker build -t openiap/openflow:edge .',
204+
// 'docker tag openiap/openflow:edge openiap/openflow:' + version,
205+
// 'echo "Push openiap/openflow"',
206+
// 'docker push openiap/openflow:edge',
207+
// 'docker push openiap/openflow:' + version
201208
]));
202209

203210
gulp.task("latest", shell.task([

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@openiap/openflow",
3-
"version": "1.2.95",
3+
"version": "1.2.98",
44
"description": "Simple wrapper around NodeRed, RabbitMQ and MongoDB to support a more scaleable NodeRed implementation.\r Also the \"backend\" for [OpenRPA](https://github.com/skadefro/OpenRPA)",
55
"main": "index.js",
66
"scripts": {

0 commit comments

Comments
 (0)