diff --git a/Dockerfile b/Dockerfile index 6777590..516977c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,68 +20,68 @@ COPY root/ / RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ - autoconf \ - ca-certificates \ - gcc \ - g++ \ - jq \ - make \ - python3-dev \ - unzip && \ + autoconf \ + ca-certificates \ + gcc \ + g++ \ + jq \ + make \ + python3-dev \ + unzip && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - bluez-deprecated \ - curl \ - eudev-libs \ - ffmpeg \ - iputils \ - libcap \ - libjpeg-turbo \ - libstdc++ \ - libxslt \ - mariadb-connector-c \ - mariadb-connector-c-dev \ - openssh-client \ - openssl \ - postgresql-libs \ - py3-pip \ - python3 \ - tiff && \ + bluez-deprecated \ + curl \ + eudev-libs \ + ffmpeg \ + iputils \ + libcap \ + libjpeg-turbo \ + libstdc++ \ + libxslt \ + mariadb-connector-c \ + mariadb-connector-c-dev \ + openssh-client \ + openssl \ + postgresql-libs \ + py3-pip \ + python3 \ + tiff && \ echo "**** install homeassistant ****" && \ mkdir -p \ - /tmp/core && \ + /tmp/core && \ if [ -z ${HASS_RELEASE+x} ]; then \ - HASS_RELEASE=$(curl -sX GET https://api.github.com/repos/home-assistant/core/releases/latest \ - | jq -r .tag_name); \ + HASS_RELEASE=$(curl -sX GET https://api.github.com/repos/home-assistant/core/releases/latest \ + | jq -r .tag_name); \ fi && \ curl -o \ - /tmp/core.tar.gz -L \ - "https://github.com/home-assistant/core/archive/${HASS_RELEASE}.tar.gz" && \ + /tmp/core.tar.gz -L \ + "https://github.com/home-assistant/core/archive/${HASS_RELEASE}.tar.gz" && \ tar xf \ - /tmp/core.tar.gz -C \ - /tmp/core --strip-components=1 && \ + /tmp/core.tar.gz -C \ + /tmp/core --strip-components=1 && \ HASS_BASE=$(cat /tmp/core/build.json \ - | jq -r .build_from.amd64 \ - | cut -d: -f2) && \ + | jq -r .build_from.amd64 \ + | cut -d: -f2) && \ mkdir -p /pip-packages && \ pip install --target /pip-packages --no-cache-dir --upgrade \ - distlib && \ + distlib && \ pip install --no-cache-dir --upgrade \ - pip==20.2 \ - wheel && \ + pip==20.2 \ + wheel && \ pip install ${PIPFLAGS} \ - homeassistant==${HASS_RELEASE} && \ + homeassistant==${HASS_RELEASE} && \ cd /tmp/core && \ pip install ${PIPFLAGS} \ - -r requirements_all.txt && \ + -r requirements_all.txt && \ pip install ${PIPFLAGS} \ - -r https://raw.githubusercontent.com/home-assistant/docker/${HASS_BASE}/requirements.txt && \ + -r https://raw.githubusercontent.com/home-assistant/docker/${HASS_BASE}/requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ - build-dependencies && \ + build-dependencies && \ rm -rf \ - /tmp/* \ - /root/.cache + /tmp/* \ + /root/.cache # environment settings. used so pip packages installed by home assistant installs in /config ENV HOME="/config" diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index ad2c02b..b0828cf 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -20,67 +20,67 @@ COPY root/ / RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ - autoconf \ - ca-certificates \ - gcc \ - g++ \ - jq \ - make \ - python3-dev \ - unzip && \ + autoconf \ + ca-certificates \ + gcc \ + g++ \ + jq \ + make \ + python3-dev \ + unzip && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - bluez-deprecated \ - curl \ - eudev-libs \ - ffmpeg \ - iputils \ - libcap \ - libjpeg-turbo \ - libstdc++ \ - libxslt \ - mariadb-connector-c \ - mariadb-connector-c-dev \ - openssh-client \ - openssl \ - postgresql-libs \ - py3-pip \ - python3 \ - tiff && \ + bluez-deprecated \ + curl \ + eudev-libs \ + ffmpeg \ + iputils \ + libcap \ + libjpeg-turbo \ + libstdc++ \ + libxslt \ + mariadb-connector-c \ + mariadb-connector-c-dev \ + openssh-client \ + openssl \ + postgresql-libs \ + py3-pip \ + python3 \ + tiff && \ echo "**** install homeassistant ****" && \ mkdir -p \ - /tmp/core && \ + /tmp/core && \ if [ -z ${HASS_RELEASE+x} ]; then \ - HASS_RELEASE=$(curl -sX GET https://api.github.com/repos/home-assistant/core/releases/latest \ - | jq -r .tag_name); \ + HASS_RELEASE=$(curl -sX GET https://api.github.com/repos/home-assistant/core/releases/latest \ + | jq -r .tag_name); \ fi && \ curl -o \ - /tmp/core.tar.gz -L \ - "https://github.com/home-assistant/core/archive/${HASS_RELEASE}.tar.gz" && \ + /tmp/core.tar.gz -L \ + "https://github.com/home-assistant/core/archive/${HASS_RELEASE}.tar.gz" && \ tar xf \ - /tmp/core.tar.gz -C \ - /tmp/core --strip-components=1 && \ + /tmp/core.tar.gz -C \ + /tmp/core --strip-components=1 && \ HASS_BASE=$(cat /tmp/core/build.json \ - | jq -r .build_from.aarch64 \ - | cut -d: -f2) && \ + | jq -r .build_from.aarch64 \ + | cut -d: -f2) && \ pip install --target /pip-packages --no-cache-dir --upgrade \ - distlib && \ + distlib && \ pip install --no-cache-dir --upgrade \ - pip==20.2 \ - wheel && \ + pip==20.2 \ + wheel && \ pip install ${PIPFLAGS} \ - homeassistant==${HASS_RELEASE} && \ + homeassistant==${HASS_RELEASE} && \ cd /tmp/core && \ pip install ${PIPFLAGS} \ - -r requirements_all.txt && \ + -r requirements_all.txt && \ pip install ${PIPFLAGS} \ - -r https://raw.githubusercontent.com/home-assistant/docker/${HASS_BASE}/requirements.txt && \ + -r https://raw.githubusercontent.com/home-assistant/docker/${HASS_BASE}/requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ - build-dependencies && \ + build-dependencies && \ rm -rf \ - /tmp/* \ - /root/.cache + /tmp/* \ + /root/.cache # environment settings. used so pip packages installed by home assistant installs in /config ENV HOME="/config" diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 215b635..3b25133 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -20,67 +20,67 @@ COPY root/ / RUN \ echo "**** install build packages ****" && \ apk add --no-cache --virtual=build-dependencies \ - autoconf \ - ca-certificates \ - gcc \ - g++ \ - jq \ - make \ - python3-dev \ - unzip && \ + autoconf \ + ca-certificates \ + gcc \ + g++ \ + jq \ + make \ + python3-dev \ + unzip && \ echo "**** install runtime packages ****" && \ apk add --no-cache \ - bluez-deprecated \ - curl \ - eudev-libs \ - ffmpeg \ - iputils \ - libcap \ - libjpeg-turbo \ - libstdc++ \ - libxslt \ - mariadb-connector-c \ - mariadb-connector-c-dev \ - openssh-client \ - openssl \ - postgresql-libs \ - py3-pip \ - python3 \ - tiff && \ + bluez-deprecated \ + curl \ + eudev-libs \ + ffmpeg \ + iputils \ + libcap \ + libjpeg-turbo \ + libstdc++ \ + libxslt \ + mariadb-connector-c \ + mariadb-connector-c-dev \ + openssh-client \ + openssl \ + postgresql-libs \ + py3-pip \ + python3 \ + tiff && \ echo "**** install homeassistant ****" && \ mkdir -p \ - /tmp/core && \ + /tmp/core && \ if [ -z ${HASS_RELEASE+x} ]; then \ - HASS_RELEASE=$(curl -sX GET https://api.github.com/repos/home-assistant/core/releases/latest \ - | jq -r .tag_name); \ + HASS_RELEASE=$(curl -sX GET https://api.github.com/repos/home-assistant/core/releases/latest \ + | jq -r .tag_name); \ fi && \ curl -o \ - /tmp/core.tar.gz -L \ - "https://github.com/home-assistant/core/archive/${HASS_RELEASE}.tar.gz" && \ + /tmp/core.tar.gz -L \ + "https://github.com/home-assistant/core/archive/${HASS_RELEASE}.tar.gz" && \ tar xf \ - /tmp/core.tar.gz -C \ - /tmp/core --strip-components=1 && \ + /tmp/core.tar.gz -C \ + /tmp/core --strip-components=1 && \ HASS_BASE=$(cat /tmp/core/build.json \ - | jq -r .build_from.armhf \ - | cut -d: -f2) && \ + | jq -r .build_from.armhf \ + | cut -d: -f2) && \ pip install --target /pip-packages --no-cache-dir --upgrade \ - distlib && \ + distlib && \ pip install --no-cache-dir --upgrade \ - pip==20.2 \ - wheel && \ + pip==20.2 \ + wheel && \ pip install ${PIPFLAGS} \ - homeassistant==${HASS_RELEASE} && \ + homeassistant==${HASS_RELEASE} && \ cd /tmp/core && \ pip install ${PIPFLAGS} \ - -r requirements_all.txt && \ + -r requirements_all.txt && \ pip install ${PIPFLAGS} \ - -r https://raw.githubusercontent.com/home-assistant/docker/${HASS_BASE}/requirements.txt && \ + -r https://raw.githubusercontent.com/home-assistant/docker/${HASS_BASE}/requirements.txt && \ echo "**** cleanup ****" && \ apk del --purge \ - build-dependencies && \ + build-dependencies && \ rm -rf \ - /tmp/* \ - /root/.cache + /tmp/* \ + /root/.cache # environment settings. used so pip packages installed by home assistant installs in /config ENV HOME="/config"