From 1eedd0031a101e1519b9d366b094823858c18753 Mon Sep 17 00:00:00 2001 From: kev Date: Mon, 8 Nov 2021 17:25:37 +0800 Subject: [PATCH] update hass --- hass/Dockerfile | 12 +++++++----- hass/Dockerfile.debian | 4 ++-- hass/arm/Dockerfile | 14 ++++++++------ hass/arm/Dockerfile.debian | 10 ++++++---- hass/arm/docker-compose.yml | 24 +++++++++--------------- hass/docker-compose.yml | 24 +++++++++--------------- 6 files changed, 41 insertions(+), 47 deletions(-) diff --git a/hass/Dockerfile b/hass/Dockerfile index b4be25c..0dec33c 100644 --- a/hass/Dockerfile +++ b/hass/Dockerfile @@ -5,9 +5,10 @@ FROM alpine:3 MAINTAINER EasyPi Software Foundation -ENV HASS_VERSION=0.102.1 -ENV HASS_CLI_VERSION=3.1.0 -ENV HASS_CLI_ARCH=amd64 +ENV HASS_VERSION=2021.11.1 +ENV HASS_CLI_VERSION=4.14.0 + +ARG HASS_CLI_ARCH=amd64 RUN set -xe \ && apk update \ @@ -19,9 +20,10 @@ RUN set -xe \ openssl-dev \ python3 \ python3-dev \ + && curl https://bootstrap.pypa.io/get-pip.py | python3 \ && pip3 install --no-cache-dir homeassistant==${HASS_VERSION} \ - && wget https://github.com/home-assistant/hassio-cli/releases/download/${HASS_CLI_VERSION}/hassio_${HASS_CLI_ARCH} -O /usr/local/bin/hassio \ - && chmod +x /usr/local/bin/hassio + && wget https://github.com/home-assistant/cli/releases/download/${HASS_CLI_VERSION}/ha_${HASS_CLI_ARCH} -O /usr/local/bin/ha \ + && chmod +x /usr/local/bin/ha VOLUME /etc/hass EXPOSE 8123 diff --git a/hass/Dockerfile.debian b/hass/Dockerfile.debian index 7c25e47..efdcd56 100644 --- a/hass/Dockerfile.debian +++ b/hass/Dockerfile.debian @@ -2,7 +2,7 @@ # Dockerfile for hass (Home Assistant) # -FROM debian:jessie +FROM debian:bullseye MAINTAINER EasyPi Software Foundation RUN set -xe \ @@ -23,7 +23,7 @@ RUN set -xe \ && pip3 install --no-cache-dir gattlib \ homeassistant \ pybluez \ - && setcap 'cap_net_raw,cap_net_admin+eip' /usr/bin/python3.4 \ + && setcap 'cap_net_raw,cap_net_admin+eip' /usr/bin/python3.9 \ && apt-get remove -y curl \ libbluetooth-dev \ libboost-python-dev \ diff --git a/hass/arm/Dockerfile b/hass/arm/Dockerfile index c01f107..edba67d 100644 --- a/hass/arm/Dockerfile +++ b/hass/arm/Dockerfile @@ -2,12 +2,13 @@ # Dockerfile for hass-arm (Home Assistant) # -FROM arm32v7/alpine:3 +FROM alpine:3 MAINTAINER EasyPi Software Foundation -ENV HASS_VERSION=0.102.1 -ENV HASS_CLI_VERSION=3.1.0 -ENV HASS_CLI_ARCH=armhf +ENV HASS_VERSION=2021.11.1 +ENV HASS_CLI_VERSION=4.14.0 + +ARG HASS_CLI_ARCH=armhf RUN set -xe \ && apk update \ @@ -19,9 +20,10 @@ RUN set -xe \ openssl-dev \ python3 \ python3-dev \ + && curl https://bootstrap.pypa.io/get-pip.py | python3 \ && pip3 install --no-cache-dir homeassistant==${HASS_VERSION} \ - && wget https://github.com/home-assistant/hassio-cli/releases/download/${HASS_CLI_VERSION}/hassio_${HASS_CLI_ARCH} -O /usr/local/bin/hassio \ - && chmod +x /usr/local/bin/hassio + && wget https://github.com/home-assistant/cli/releases/download/${HASS_CLI_VERSION}/ha_${HASS_CLI_ARCH} -O /usr/local/bin/ha \ + && chmod +x /usr/local/bin/ha VOLUME /etc/hass EXPOSE 8123 diff --git a/hass/arm/Dockerfile.debian b/hass/arm/Dockerfile.debian index b4ffd27..3ad6338 100644 --- a/hass/arm/Dockerfile.debian +++ b/hass/arm/Dockerfile.debian @@ -2,11 +2,13 @@ # Dockerfile for hass-arm (Home Assistant) # -FROM balenalib/rpi-raspbian:buster +FROM debian:bullseye MAINTAINER EasyPi Software Foundation -ENV HASS_VERSION=0.102.1 -ENV HASS_CLI_VERSION=3.1.0 +ENV HASS_VERSION=2021.11.1 +ENV HASS_CLI_VERSION=4.14.0 + +ARG HASS_CLI_ARCH=armhf RUN set -xe \ && apt-get update \ @@ -28,7 +30,7 @@ RUN set -xe \ gattlib \ homeassistant \ pybluez \ - && setcap 'cap_net_raw,cap_net_admin+eip' /usr/bin/python3.7 \ + && setcap 'cap_net_raw,cap_net_admin+eip' /usr/bin/python3.9 \ && apt-get remove -y \ curl \ libbluetooth-dev \ diff --git a/hass/arm/docker-compose.yml b/hass/arm/docker-compose.yml index 4e8422d..4911764 100644 --- a/hass/arm/docker-compose.yml +++ b/hass/arm/docker-compose.yml @@ -1,15 +1,9 @@ -hass: - image: easypi/hass-arm - volumes: - - ./data:/etc/hass - net: host - privileged: yes - restart: unless-stopped - -hcfg: - image: easypi/hcfg-arm - volumes: - - ./data:/etc/hass - net: host - working_dir: /etc/hass - restart: unless-stopped +version: "3.8" +services: + hass: + image: easypi/hass-arm + volumes: + - ./data:/etc/hass + net: host + privileged: yes + restart: unless-stopped diff --git a/hass/docker-compose.yml b/hass/docker-compose.yml index c5281bf..2fa385e 100644 --- a/hass/docker-compose.yml +++ b/hass/docker-compose.yml @@ -1,15 +1,9 @@ -hass: - image: vimagick/hass:debian - volumes: - - ./data:/etc/hass - net: host - privileged: yes - restart: unless-stopped - -hcfg: - image: vimagick/hcfg - volumes: - - ./data:/etc/hass - net: host - working_dir: /etc/hass - restart: unless-stopped +version: "3.8" +services: + hass: + image: vimagick/hass:debian + volumes: + - ./data:/etc/hass + net: host + privileged: yes + restart: unless-stopped