From db32fea13bfa91eed63aae4777bd63179c5960d0 Mon Sep 17 00:00:00 2001 From: aptalca Date: Sat, 25 Sep 2021 19:20:11 -0400 Subject: [PATCH] use the new lsio ha wheel repo --- Dockerfile | 5 +---- Dockerfile.aarch64 | 5 +---- Dockerfile.armhf | 5 +---- README.md | 1 + readme-vars.yml | 1 + 5 files changed, 5 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 06761f7..f29888e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="saarg, roxedus" # environment settings -ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ --find-links https://wheels.home-assistant.io/alpine-3.14/amd64/ --find-links https://wheels.home-assistant.io/alpine-3.13/amd64/ --find-links https://wheels.home-assistant.io/alpine-3.13/amd64/" PYTHONPATH="${PYTHONPATH}:/pip-packages" +ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -find-links https://wheel-index.linuxserver.io/homeassistant/ PYTHONPATH="${PYTHONPATH}:/pip-packages" # copy local files COPY root/ / @@ -80,9 +80,6 @@ RUN \ pip==20.2 \ wheel && \ cd /tmp/core && \ - CISO8601=$(grep 'ciso8601' requirements.txt) && \ - PSYCOPG=$(curl -sL "https://raw.githubusercontent.com/home-assistant/docker/${HASS_BASE}/requirements.txt" | grep 'psycopg2') && \ - pip install ${CISO8601} ${PSYCOPG} && \ pip install ${PIPFLAGS} \ homeassistant==${HASS_RELEASE} && \ pip install ${PIPFLAGS} \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 0eaaa3b..86ff021 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -9,7 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="saarg, roxedus" # environment settings -ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ --find-links https://wheels.home-assistant.io/alpine-3.14/aarch64/ --find-links https://wheels.home-assistant.io/alpine-3.13/aarch64/ --find-links https://wheels.home-assistant.io/alpine-3.12/aarch64/" PYTHONPATH="${PYTHONPATH}:/pip-packages" +ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ -find-links https://wheel-index.linuxserver.io/homeassistant/ PYTHONPATH="${PYTHONPATH}:/pip-packages" # copy local files COPY root/ / @@ -79,9 +79,6 @@ RUN \ pip==20.2 \ wheel && \ cd /tmp/core && \ - CISO8601=$(grep 'ciso8601' requirements.txt) && \ - PSYCOPG=$(curl -sL "https://raw.githubusercontent.com/home-assistant/docker/${HASS_BASE}/requirements.txt" | grep 'psycopg2') && \ - pip install ${CISO8601} ${PSYCOPG} && \ pip install ${PIPFLAGS} \ homeassistant==${HASS_RELEASE} && \ pip install ${PIPFLAGS} \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 4a4d8d6..76e4304 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -9,7 +9,7 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA LABEL maintainer="saarg, roxedus" # environment settings -ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ --find-links https://wheels.home-assistant.io/alpine-3.14/armhf/ --find-links https://wheels.home-assistant.io/alpine-3.13/armhf/ --find-links https://wheels.home-assistant.io/alpine-3.12/armhf/" PYTHONPATH="${PYTHONPATH}:/pip-packages" +ENV PIPFLAGS="--no-cache-dir --find-links https://wheel-index.linuxserver.io/alpine/ --find-links https://wheel-index.linuxserver.io/homeassistant/ PYTHONPATH="${PYTHONPATH}:/pip-packages" # copy local files COPY root/ / @@ -79,9 +79,6 @@ RUN \ pip==20.2 \ wheel && \ cd /tmp/core && \ - CISO8601=$(grep 'ciso8601' requirements.txt) && \ - PSYCOPG=$(curl -sL "https://raw.githubusercontent.com/home-assistant/docker/${HASS_BASE}/requirements.txt" | grep 'psycopg2') && \ - pip install ${CISO8601} ${PSYCOPG} && \ pip install ${PIPFLAGS} \ homeassistant==${HASS_RELEASE} && \ pip install ${PIPFLAGS} \ diff --git a/README.md b/README.md index 556274d..8c7773e 100644 --- a/README.md +++ b/README.md @@ -237,6 +237,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **25.09.21:** - Use the new lsio homeassistant wheel repo, instead of the HA wheels. * **13.09.21:** - Build psycopg locally as the HA provided wheel does not seem to work properly. * **13.09.21:** - Fix setcap in service. Build CISO8601 locally as the HA provided wheel does not seem to work properly. * **12.09.21:** - Rebase to alpine 3.14. Build on native armhf. diff --git a/readme-vars.yml b/readme-vars.yml index f9dfd45..f7d4259 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -58,6 +58,7 @@ app_setup_block: | # changelog changelogs: + - { date: "25.09.21:", desc: "Use the new lsio homeassistant wheel repo, instead of the HA wheels." } - { date: "13.09.21:", desc: "Build psycopg locally as the HA provided wheel does not seem to work properly." } - { date: "13.09.21:", desc: "Fix setcap in service. Build CISO8601 locally as the HA provided wheel does not seem to work properly." } - { date: "12.09.21:", desc: "Rebase to alpine 3.14. Build on native armhf." }