From cd20a59ba3c07fafa185a50de59b72f59d4159b3 Mon Sep 17 00:00:00 2001 From: kev Date: Sun, 6 Oct 2019 18:02:50 +0800 Subject: [PATCH] update node-red --- node-red/Dockerfile | 39 ++++++++++++---------- node-red/arm/Dockerfile | 39 ++++++++++++---------- superset/arm/Dockerfile | 73 ++++++++++++++++++++--------------------- 3 files changed, 78 insertions(+), 73 deletions(-) diff --git a/node-red/Dockerfile b/node-red/Dockerfile index edbaf15..6d18e3a 100644 --- a/node-red/Dockerfile +++ b/node-red/Dockerfile @@ -6,27 +6,30 @@ FROM alpine MAINTAINER EasyPi Software Foundation RUN set -xe \ - && apk add --no-cache bash \ - build-base \ - ca-certificates \ - curl \ - nodejs \ - nodejs-npm \ - python3 \ - python3-dev \ + && apk add --no-cache + bash \ + build-base \ + ca-certificates \ + curl \ + nodejs \ + nodejs-npm \ + python3 \ + python3-dev \ && ln -sf /usr/bin/python3 /usr/bin/python \ && pip3 install --no-cache-dir rpi.gpio \ - && npm install -g --unsafe-perm node-red \ - node-red-admin \ - node-red-dashboard \ - node-red-node-email \ - node-red-node-feedparser \ - node-red-node-pi-gpio \ - node-red-node-sentiment \ - node-red-node-twitter \ + && npm install -g --unsafe-perm + node-red \ + node-red-admin \ + node-red-dashboard \ + node-red-node-email \ + node-red-node-feedparser \ + node-red-node-pi-gpio \ + node-red-node-sentiment \ + node-red-node-twitter \ && mkdir -p /usr/share/doc/python-rpi.gpio \ - && apk del build-base \ - python3-dev \ + && apk del + build-base \ + python3-dev \ && rm -rf /tmp/npm-* WORKDIR /data diff --git a/node-red/arm/Dockerfile b/node-red/arm/Dockerfile index 80b91c5..1d599c6 100644 --- a/node-red/arm/Dockerfile +++ b/node-red/arm/Dockerfile @@ -6,27 +6,30 @@ FROM arm32v7/alpine:3 MAINTAINER EasyPi Software Foundation RUN set -xe \ - && apk add --no-cache bash \ - build-base \ - ca-certificates \ - curl \ - nodejs \ - nodejs-npm \ - python3 \ - python3-dev \ + && apk add --no-cache + bash \ + build-base \ + ca-certificates \ + curl \ + nodejs \ + nodejs-npm \ + python3 \ + python3-dev \ && ln -sf /usr/bin/python3 /usr/bin/python \ && pip3 install --no-cache-dir rpi.gpio \ - && npm install -g --unsafe-perm node-red \ - node-red-admin \ - node-red-dashboard \ - node-red-node-email \ - node-red-node-feedparser \ - node-red-node-pi-gpio \ - node-red-node-sentiment \ - node-red-node-twitter \ + && npm install -g --unsafe-perm + node-red \ + node-red-admin \ + node-red-dashboard \ + node-red-node-email \ + node-red-node-feedparser \ + node-red-node-pi-gpio \ + node-red-node-sentiment \ + node-red-node-twitter \ && mkdir -p /usr/share/doc/python-rpi.gpio \ - && apk del build-base \ - python3-dev \ + && apk del + build-base \ + python3-dev \ && rm -rf /tmp/npm-* WORKDIR /data diff --git a/superset/arm/Dockerfile b/superset/arm/Dockerfile index 0c151b8..5f914d4 100644 --- a/superset/arm/Dockerfile +++ b/superset/arm/Dockerfile @@ -2,11 +2,11 @@ # Dockerfile for superset-arm # -FROM resin/rpi-raspbian:stretch +FROM arm32v7/debian:buster MAINTAINER EasyPi Software Foundation # Superset version -ARG SUPERSET_VERSION=0.28.1 +ARG SUPERSET_VERSION=0.34.0 # Configure environment ENV GUNICORN_BIND=0.0.0.0:8088 \ @@ -23,49 +23,48 @@ ENV GUNICORN_BIND=0.0.0.0:8088 \ ENV GUNICORN_CMD_ARGS="--workers ${GUNICORN_WORKERS} --timeout ${GUNICORN_TIMEOUT} --bind ${GUNICORN_BIND} --limit-request-line ${GUNICORN_LIMIT_REQUEST_LINE} --limit-request-field_size ${GUNICORN_LIMIT_REQUEST_FIELD_SIZE}" # Create superset user & install dependencies -RUN useradd -U -m superset && \ - mkdir /etc/superset && \ - mkdir ${SUPERSET_HOME} && \ - chown -R superset:superset /etc/superset && \ - chown -R superset:superset ${SUPERSET_HOME} && \ - apt-get update && \ - apt-get install -y \ +RUN set -xe \ + && useradd -U -m superset \ + && mkdir /etc/superset \ + && mkdir ${SUPERSET_HOME} \ + && chown -R superset:superset /etc/superset \ + && chown -R superset:superset ${SUPERSET_HOME} \ + && apt-get update \ + && apt-get install -y \ build-essential \ curl \ - default-libmysqlclient-dev \ - freetds-dev \ freetds-bin \ + freetds-dev \ + libffi-dev \ + libffi6 \ + libldap-2.4-2 \ + libldap2-dev \ + libmariadb-dev \ + libmariadb3 \ + libpq-dev \ + libpq5 \ + libsasl2-2 \ + libsasl2-dev \ + libssl-dev \ + libssl1.1 \ + python3 \ + python3-dev \ + && curl https://raw.githubusercontent.com/${SUPERSET_REPO}/${SUPERSET_VERSION}/requirements.txt -o requirements.txt \ + && curl https://raw.githubusercontent.com/amancevice/docker-superset/master/requirements-db.txt -o requirements-db.txt \ + && curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 \ + && pip3 install --no-cache-dir -r requirements.txt -r requirements-db.txt superset==${SUPERSET_VERSION} \ + && apt-get remove -y \ + build-essential \ + freetds-dev \ libffi-dev \ libldap2-dev \ + libmariadb-dev \ libpq-dev \ libsasl2-dev \ libssl-dev \ - python3-dev && \ - apt-get clean && \ - rm -r /var/lib/apt/lists/* && \ - curl https://raw.githubusercontent.com/${SUPERSET_REPO}/${SUPERSET_VERSION}/requirements.txt -o requirements.txt && \ - curl -sSL https://bootstrap.pypa.io/get-pip.py | python3 && \ - pip3 install --no-cache-dir -r requirements.txt && \ - pip3 install --no-cache-dir \ - Werkzeug==0.12.1 \ - flask-cors==3.0.3 \ - flask-mail==0.9.1 \ - flask-oauth==0.12 \ - flask_oauthlib==0.9.3 \ - gevent==1.2.2 \ - impyla==0.14.0 \ - infi.clickhouse-orm==1.0.2 \ - mysqlclient==1.3.7 \ - psycopg2==2.6.1 \ - pyathena==1.2.5 \ - pyhive==0.5.1 \ - pyldap==2.4.28 \ - pymssql==2.1.3 \ - redis==2.10.5 \ - sqlalchemy-clickhouse==0.1.5.post0 \ - sqlalchemy-redshift==0.7.1 \ - superset==${SUPERSET_VERSION} && \ - rm requirements.txt + python3-dev \ + && apt-get clean \ + && rm -r requirements.txt requirements-db.txt /var/lib/apt/lists/* # Configure Filesystem COPY superset /usr/local/bin