diff --git a/airflow/Dockerfile b/airflow/Dockerfile index cd44f0a..c4f41c1 100644 --- a/airflow/Dockerfile +++ b/airflow/Dockerfile @@ -22,7 +22,7 @@ RUN set -xe \ python3-dev \ && pip install cython numpy psycopg2-binary \ && pip install apache-airflow[${AIRFLOW_EXTRAS}]==${AIRFLOW_VERSION} \ - && pip install "websocket-client<0.55.0,>=0.35" \ + && pip install "websocket-client>=0.35,<0.55.0" \ && apk del \ build-base \ cyrus-sasl-dev \ diff --git a/gogs/arm/Dockerfile b/gogs/arm/Dockerfile index 2689e1f..f65ff8c 100644 --- a/gogs/arm/Dockerfile +++ b/gogs/arm/Dockerfile @@ -2,22 +2,23 @@ # Dockerfile for gogs-arm # -FROM easypi/alpine-arm +FROM arm32v7/alpine:3 MAINTAINER EasyPi Software Foundation ENV GOSU_VERSION 1.11 ENV GOGS_VERSION 0.11.91 ENV GOGS_CUSTOM /data/gogs -RUN apk add --no-cache bash \ - ca-certificates \ - curl \ - git \ - linux-pam \ - openssh \ - s6 \ - socat \ - tar +RUN apk add --no-cache \ + bash \ + ca-certificates \ + curl \ + git \ + linux-pam \ + openssh \ + s6 \ + socat \ + tar RUN set -xe \ && adduser -H -D -g 'Gogs Git User' -h /data/git -s /bin/bash git \ @@ -32,9 +33,9 @@ RUN set -xe \ && mkdir /app/ \ && cd /app/ \ && curl -LO https://github.com/gogits/gogs/releases/download/v${GOGS_VERSION}/raspi_armv7.zip \ - && unzip raspi2_armv6.zip \ - && rm raspi2_armv6.zip \ - && ln -s /lib/libc.musl-armhf.so.1 /lib/ld-linux-armhf.so.3 + && unzip raspi_armv7.zip \ + && rm raspi_armv7.zip \ + && ln -s /lib/libc.musl-armv7.so.1 /lib/ld-linux-armhf.so.3 RUN set -xe \ && cd /app/gogs/ \ diff --git a/hass/arm/Dockerfile b/hass/arm/Dockerfile index c974c20..6d7c093 100644 --- a/hass/arm/Dockerfile +++ b/hass/arm/Dockerfile @@ -2,22 +2,25 @@ # Dockerfile for hass-arm (Home Assistant) # -FROM easypi/alpine-arm +FROM arm32v7/alpine:3 MAINTAINER EasyPi Software Foundation +ENV HASS_VERSION=0.100.2 +ENV HASS_CLI_VERSION=3.1.0 + RUN set -xe \ && apk update \ - && apk add --no-cache ca-certificates \ - build-base \ - libffi-dev \ - linux-headers \ - openssl-dev \ - python3 \ - python3-dev \ - && pip3 install --no-cache-dir homeassistant \ - && wget https://github.com/home-assistant/hassio-cli/releases/download/1.3.1/hassio_armhf -O /usr/local/bin/hassio + && apk add --no-cache \ + ca-certificates \ + build-base \ + libffi-dev \ + linux-headers \ + openssl-dev \ + python3 \ + python3-dev \ + && pip3 install --no-cache-dir homeassistant==${HASS_VERSION} \ + && wget https://github.com/home-assistant/hassio-cli/releases/download/${HASS_CLI_VERSION}/hassio_armhf -O /usr/local/bin/hassio VOLUME /etc/hass EXPOSE 8123 - ENTRYPOINT ["hass", "--config", "/etc/hass"] diff --git a/hass/arm/Dockerfile.debian b/hass/arm/Dockerfile.debian index ced5b8d..b7e3a35 100644 --- a/hass/arm/Dockerfile.debian +++ b/hass/arm/Dockerfile.debian @@ -2,37 +2,42 @@ # Dockerfile for hass-arm (Home Assistant) # -FROM resin/rpi-raspbian:jessie +FROM balenalib/rpi-raspbian:buster MAINTAINER EasyPi Software Foundation +ENV HASS_VERSION=0.100.2 +ENV HASS_CLI_VERSION=3.1.0 + RUN set -xe \ && apt-get update \ - && apt-get install -y build-essential \ - bluez \ - curl \ - libbluetooth3 \ - libbluetooth-dev \ - libboost-python-dev \ - libboost-thread-dev \ - libglib2.0 \ - libglib2.0-dev \ - pkg-config \ - python-dev \ - python3-dev \ + && apt-get install -y \ + build-essential \ + bluez \ + curl \ + libbluetooth3 \ + libbluetooth-dev \ + libboost-python-dev \ + libboost-thread-dev \ + libglib2.0 \ + libglib2.0-dev \ + pkg-config \ + python-dev \ + python3-dev \ && curl https://bootstrap.pypa.io/get-pip.py | python3 \ - && pip3 install --no-cache-dir gattlib \ - homeassistant \ - pybluez \ - && setcap 'cap_net_raw,cap_net_admin+eip' /usr/bin/python3.4 \ - && apt-get remove -y curl \ - libbluetooth-dev \ - libboost-python-dev \ - libboost-thread-dev \ - libglib2.0-dev \ - pkg-config \ - python-dev + && pip3 install --no-cache-dir \ + gattlib \ + homeassistant \ + pybluez \ + && setcap 'cap_net_raw,cap_net_admin+eip' /usr/bin/python3.7 \ + && apt-get remove -y \ + curl \ + libbluetooth-dev \ + libboost-python-dev \ + libboost-thread-dev \ + libglib2.0-dev \ + pkg-config \ + python-dev VOLUME /etc/hass EXPOSE 8123 - ENTRYPOINT ["hass", "--config", "/etc/hass"] diff --git a/hubot/arm/Dockerfile b/hubot/arm/Dockerfile index a29ba1f..4464d68 100644 --- a/hubot/arm/Dockerfile +++ b/hubot/arm/Dockerfile @@ -2,7 +2,7 @@ # Dockerfile for hubot-arm # -FROM easypi/alpine-arm +FROM arm32v7/alpine:3 MAINTAINER EasyPi Software Foundation ENV HUBOT_NAME=Hubot diff --git a/jenkins/arm/Dockerfile b/jenkins/arm/Dockerfile index 2bf17f8..3195b07 100644 --- a/jenkins/arm/Dockerfile +++ b/jenkins/arm/Dockerfile @@ -2,21 +2,22 @@ # Dockerfile for jenkins-arm # -FROM easypi/alpine-arm:edge +FROM arm32v7/alpine:3 MAINTAINER EasyPi Software Foundation ENV JENKINS_HOME /var/jenkins_home RUN set -xe \ - && apk add --no-cache bash \ - coreutils \ - curl \ - git \ - openjdk8 \ - openssh-client \ - ttf-dejavu \ - unzip \ - zip \ + && apk add --no-cache \ + bash \ + coreutils \ + curl \ + git \ + openjdk8 \ + openssh-client \ + ttf-dejavu \ + unzip \ + zip \ && addgroup -g 1000 jenkins \ && adduser -h $JENKINS_HOME -u 1000 -G jenkins -s /bin/bash -D jenkins \ && mkdir -p /usr/share/jenkins \ diff --git a/presto/Dockerfile.alpine-ce b/presto/Dockerfile.alpine-ce new file mode 100644 index 0000000..8c6cac4 --- /dev/null +++ b/presto/Dockerfile.alpine-ce @@ -0,0 +1,28 @@ +# +# Dockerfile for presto-ce +# + +FROM openjdk:8-jre-alpine +MAINTAINER kev + +ENV PRESTO_VERSION=322 +ENV PRESTO_SERVER_URL=https://repo1.maven.org/maven2/io/prestosql/presto-server/${PRESTO_VERSION}/presto-server-${PRESTO_VERSION}.tar.gz +ENV PRESTO_CLI_URL=https://repo1.maven.org/maven2/io/prestosql/presto-cli/${PRESTO_VERSION}/presto-cli-${PRESTO_VERSION}-executable.jar +ENV PRESTO_HOME=/opt/presto +ENV PATH=${PRESTO_HOME}/bin:${PATH} + +WORKDIR $PRESTO_HOME + +RUN set -xe \ + && apk add --no-cache curl python tar \ + && curl -sSL $PRESTO_SERVER_URL | tar xz --strip 1 \ + && curl -sSL $PRESTO_CLI_URL > ./bin/presto \ + && chmod +x ./bin/presto \ + && apk del curl tar + +VOLUME /data + +EXPOSE 8080 + +ENTRYPOINT ["launcher"] +CMD ["run"] diff --git a/presto/Dockerfile.debian-ce b/presto/Dockerfile.debian-ce new file mode 100644 index 0000000..a5a7fd3 --- /dev/null +++ b/presto/Dockerfile.debian-ce @@ -0,0 +1,30 @@ +# +# Dockerfile for presto-ce +# + +FROM openjdk:8-jre-slim-buster +MAINTAINER kev + +ENV PRESTO_VERSION=322 +ENV PRESTO_SERVER_URL=https://repo1.maven.org/maven2/io/prestosql/presto-server/${PRESTO_VERSION}/presto-server-${PRESTO_VERSION}.tar.gz +ENV PRESTO_CLI_URL=https://repo1.maven.org/maven2/io/prestosql/presto-cli/${PRESTO_VERSION}/presto-cli-${PRESTO_VERSION}-executable.jar +ENV PRESTO_HOME=/opt/presto +ENV PATH=${PRESTO_HOME}/bin:${PATH} + +WORKDIR $PRESTO_HOME + +RUN set -xe \ + && apt-get update \ + && apt-get install -y curl less python \ + && curl -sSL $PRESTO_SERVER_URL | tar xz --strip 1 \ + && curl -sSL $PRESTO_CLI_URL > ./bin/presto \ + && chmod +x ./bin/presto \ + && apt-get remove -y curl \ + && rm -rf /var/lib/apt/lists/* + +VOLUME /data + +EXPOSE 8080 + +ENTRYPOINT ["launcher"] +CMD ["run"] diff --git a/superset/arm/Dockerfile b/superset/arm/Dockerfile index 24ffdca..b83cd33 100644 --- a/superset/arm/Dockerfile +++ b/superset/arm/Dockerfile @@ -37,6 +37,7 @@ RUN set -xe \ libldap-2.4-2 \ libldap2-dev \ libmariadb-dev \ + libmariadb-dev-compat \ libmariadb3 \ libpq-dev \ libpq5 \ @@ -46,10 +47,12 @@ RUN set -xe \ 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} \ + && pip3 install --no-cache-dir \ + apache-superset==${SUPERSET_VERSION} \ + mysqlclient \ + psycopg2-binary \ + pyhive[hive,presto] \ && apt-get remove -y \ build-essential \ freetds-dev \ diff --git a/superset/docker-compose.yml b/superset/docker-compose.yml index 30b4d7e..c85458b 100644 --- a/superset/docker-compose.yml +++ b/superset/docker-compose.yml @@ -20,7 +20,7 @@ services: restart: always superset: - image: amancevice/superset:0.34.0 + image: amancevice/superset:0.34.1 ports: - "8088:8088" volumes: @@ -33,7 +33,7 @@ services: restart: always worker: - image: amancevice/superset:0.34.0 + image: amancevice/superset:0.34.1 command: celery worker volumes: - ./data/superset:/etc/superset