From ab49ae8a4dc8b27c101c69b6433a4ee8e586d8a5 Mon Sep 17 00:00:00 2001 From: Filip Pytloun Date: Fri, 12 Mar 2021 17:25:00 +0100 Subject: [PATCH] Fix dep versions --- Dockerfile | 26 +++++++++++++++++--------- Dockerfile.aarch64 | 20 +++++++++++--------- entrypoint.sh | 15 +++++++++++++++ 3 files changed, 43 insertions(+), 18 deletions(-) create mode 100755 entrypoint.sh diff --git a/Dockerfile b/Dockerfile index 2779490..e4f5c88 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,20 @@ -FROM homeassistant/home-assistant:2021.3.3 +FROM homeassistant/home-assistant:2021.3.4 COPY src/ /usr/src/homeassistant/homeassistant/ -RUN /usr/local/bin/python3 -m pip install --quiet --no-cache-dir --upgrade --constraint /usr/src/homeassistant/homeassistant/package_constraints.txt --find-links https://wheels.home-assistant.io/alpine-3.10/amd64/ --prefer-binary \ - aiofiles \ - aiogithubapi \ - backoff \ - hacs_frontend \ - integrationhelper \ - semantic_version \ - queueman +RUN mkdir -p /usr/local/config/custom_components && \ + touch /usr/local/config/home-assistant.log && \ + cd /usr/local/config && \ + wget -q -O - https://install.hacs.xyz | bash - && \ + cat /usr/local/config/custom_components/hacs/manifest.json | jq -r .requirements[] | xargs /usr/local/bin/python3 -m pip install --quiet --no-cache-dir --upgrade --constraint /usr/src/homeassistant/homeassistant/package_constraints.txt --find-links https://wheels.home-assistant.io/alpine-3.10/amd64/ --prefer-binary + +RUN cd /tmp && \ + wget https://github.com/zacs/ha-dualmodegeneric/archive/refs/heads/master.zip && \ + unzip master.zip && \ + mv ha-dualmodegeneric-master/custom_components/* /usr/local/config/custom_components/ && \ + rm -rf /tmp/* + +ADD entrypoint.sh /entrypoint.sh + +ENV PYTHONUSERBASE /config/deps +ENTRYPOINT ["/entrypoint.sh"] diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 957ed1c..3bb37c1 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,12 +1,14 @@ -FROM homeassistant/home-assistant:2021.3.3 +FROM homeassistant/home-assistant:2021.3.4 COPY src/ /usr/src/homeassistant/homeassistant/ -RUN /usr/local/bin/python3 -m pip install --quiet --no-cache-dir --upgrade --constraint /usr/src/homeassistant/homeassistant/package_constraints.txt --find-links https://wheels.home-assistant.io/alpine-3.10/aarch64/ --prefer-binary \ - aiofiles \ - aiogithubapi \ - backoff \ - hacs_frontend \ - integrationhelper \ - semantic_version \ - queueman +RUN mkdir -p /usr/local/config/custom_components && \ + touch /usr/local/config/home-assistant.log && \ + cd /usr/local/config && \ + wget -q -O - https://install.hacs.xyz | bash - && \ + cat /usr/local/config/custom_components/hacs/manifest.json | jq -r .requirements[] | xargs /usr/local/bin/python3 -m pip install --quiet --no-cache-dir --upgrade --constraint /usr/src/homeassistant/homeassistant/package_constraints.txt --find-links https://wheels.home-assistant.io/alpine-3.10/amd64/ --prefer-binary + +ADD entrypoint.sh /entrypoint.sh + +ENV PYTHONUSERBASE /config/deps +ENTRYPOINT ["/entrypoint.sh"] diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100755 index 0000000..21cd63e --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,15 @@ +#!/bin/bash -e + +[ ! -f /config/custom_components ] || rm -f /config/custom_components +[ -d /config/custom_components ] || mkdir -p /config/custom_components + +for component in /usr/local/config/custom_components/*; do + cb="$(basename "${component}")" + [ ! -d "/config/custom_components/${cb}" ] || rm -rf "/config/custom_components/${cb}" + if [ ! -e "/config/custom_components/${cb}" ]; then + echo "Installing custom component ${cb}" + ln -s "${component}" "/config/custom_components/${cb}" + fi +done + +exec /init "$@"