Skip to content

Commit b26fd04

Browse files
skadefroskadefro
committed
sync and compare tagui and puppeteer
1 parent fa76114 commit b26fd04

3 files changed

Lines changed: 51 additions & 4 deletions

File tree

‎OpenFlowNodeRED/Dockerfilepuppeteer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM node:lts
22
EXPOSE 80
33
EXPOSE 5859
44
RUN apt-get update \
5-
&& apt-get install -y wget gnupg \
5+
&& apt-get install -y wget gnupg python3-pip python3-venv php \
66
&& wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
77
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
88
&& apt-get update \

‎OpenFlowNodeRED/Dockerfiletagui‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ FROM node:lts
22
EXPOSE 80
33
EXPOSE 5859
44
RUN apt-get update \
5-
&& apt-get install -y unzip wget gnupg python3-pip python3-venv php \
5+
&& apt-get install -y wget gnupg python3-pip python3-venv php \
66
&& wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
77
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
88
&& apt-get update \
9-
&& apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \
9+
&& apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf gconf-service libasound2 libatk1.0-0 libc6 libcairo2 libcups2 libdbus-1-3 libexpat1 libfontconfig1 libgcc1 libgconf-2-4 libgdk-pixbuf2.0-0 libglib2.0-0 libgtk-3-0 libnspr4 libpango-1.0-0 libpangocairo-1.0-0 libstdc++6 libx11-6 libx11-xcb1 libxcb1 libxcomposite1 libxcursor1 libxdamage1 libxext6 libxfixes3 libxi6 libxrandr2 libxrender1 libxss1 libxtst6 ca-certificates fonts-liberation libappindicator1 libnss3 lsb-release xdg-utils wget sudo libgbm-dev libxshmfence1 \
1010
--no-install-recommends \
1111
&& rm -rf /var/lib/apt/lists/*
1212
RUN pip3 install rpa
@@ -28,7 +28,8 @@ RUN ln -sf /home/openiapuser/tagui/src/tagui /usr/local/bin/tagui
2828

2929
ENV search="browser_option = 'chrome'"
3030
ENV replace="browser_option = 'headless'"
31-
RUN sed -i "s/${search}/${replace}/" /usr/local/lib/python3.5/dist-packages/tagui.py
31+
# RUN sed -i "s/${search}/${replace}/" /usr/local/lib/python3.5/dist-packages/tagui.py
32+
RUN sed -i "s/${search}/${replace}/" /usr/local/lib/python3.7/dist-packages/tagui.py
3233

3334
RUN wget -O /tmp/tagui_linux2.zip https://github.com/tebelorg/Tump/releases/download/v1.0.0/TagUI_Linux.zip \
3435
&& unzip '/tmp/tagui_linux2.zip' -d /tmp && rm /tmp/tagui_linux2.zip || true && mv /tmp/tagui /home/openiapuser/.tagui && chown -R openiapuser:openiapuser /home/openiapuser/.tagui

‎OpenFlowNodeRED/Dockerfiletagui copy‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
FROM node:lts
2+
EXPOSE 80
3+
EXPOSE 5859
4+
RUN apt-get update \
5+
&& apt-get install -y unzip wget gnupg python3-pip python3-venv php \
6+
&& wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add - \
7+
&& sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list' \
8+
&& apt-get update \
9+
&& apt-get install -y google-chrome-stable fonts-ipafont-gothic fonts-wqy-zenhei fonts-thai-tlwg fonts-kacst fonts-freefont-ttf libxss1 \
10+
--no-install-recommends \
11+
&& rm -rf /var/lib/apt/lists/*
12+
RUN pip3 install rpa
13+
WORKDIR /data
14+
RUN groupadd -r openiapuser && useradd -r -g openiapuser -G audio,video openiapuser \
15+
&& mkdir -p /home/openiapuser/Downloads \
16+
&& chown -R openiapuser:openiapuser /home/openiapuser \
17+
&& chown -R openiapuser:openiapuser /data/
18+
19+
# RUN wget -O /tmp/tagui_linux.zip https://github.com/kelaberetiv/TagUI/releases/download/v6.46.0/TagUI_Linux.zip \
20+
# && 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
21+
# RUN ln -sf /home/openiapuser/.tagui/src/tagui /usr/local/bin/tagui
22+
23+
RUN wget -O /tmp/tagui_linux.zip https://github.com/kelaberetiv/TagUI/releases/download/v6.46.0/TagUI_Linux.zip \
24+
&& unzip '/tmp/tagui_linux.zip' -d /home/openiapuser && rm /tmp/tagui_linux.zip || true && chown -R openiapuser:openiapuser /home/openiapuser
25+
RUN ln -sf /home/openiapuser/tagui/src/tagui /usr/local/bin/tagui
26+
27+
# USER openiapuser
28+
29+
ENV search="browser_option = 'chrome'"
30+
ENV replace="browser_option = 'headless'"
31+
# RUN sed -i "s/${search}/${replace}/" /usr/local/lib/python3.7/dist-packages/tagui.py
32+
33+
RUN wget -O /tmp/tagui_linux2.zip https://github.com/tebelorg/Tump/releases/download/v1.0.0/TagUI_Linux.zip \
34+
&& unzip '/tmp/tagui_linux2.zip' -d /tmp && rm /tmp/tagui_linux2.zip || true && mv /tmp/tagui /home/openiapuser/.tagui && chown -R openiapuser:openiapuser /home/openiapuser/.tagui
35+
36+
# RUN mkdir /home/openiapuser/.tagui && chown -R openiapuser:openiapuser /home/openiapuser/.tagui
37+
# RUN mkdir /home/openiapuser/.tagui_previous && chown -R openiapuser:openiapuser /home/openiapuser/.tagui_previous
38+
# RUN ln -sf /home/openiapuser/tagui /root/tagui
39+
40+
COPY --chown=openiapuser:openiapuser docker-package.json ./package.json
41+
RUN npm install --only=prod
42+
COPY --chown=openiapuser:openiapuser dist ./
43+
44+
USER openiapuser
45+
46+
ENTRYPOINT ["/usr/local/bin/node", "--inspect=0.0.0.0:5859", "index.js"]

0 commit comments

Comments
 (0)