From 7c576da32ceef53814e83bdf3d06b416eed7fe9e Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 23 Oct 2023 21:48:50 +0200 Subject: [PATCH] Revert "Update base images to 3.11-alpine3.18 (#4639)" (#4646) This reverts commit b1010c3c6167c127510a5021fb7dd03995f8b24e. It seems that the git version deployed with the latest Alpine doesn't play nice with Supervisor. Specifically it leads to "fatal: cannot exec 'remote-https': Permission denied" errors. --- .hadolint.yaml | 1 - Dockerfile | 5 +++-- build.yaml | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.hadolint.yaml b/.hadolint.yaml index e689c4a93..2cc6e2cac 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -3,5 +3,4 @@ ignored: - DL3006 - DL3013 - DL3018 - - DL3042 - SC2155 diff --git a/Dockerfile b/Dockerfile index f857b120d..c81db74df 100644 --- a/Dockerfile +++ b/Dockerfile @@ -31,14 +31,15 @@ RUN \ COPY requirements.txt . RUN \ export MAKEFLAGS="-j$(nproc)" \ - && pip3 install --only-binary=:all: \ + && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links \ + "https://wheels.home-assistant.io/musllinux/" \ -r ./requirements.txt \ && rm -f requirements.txt # Install Home Assistant Supervisor COPY . supervisor RUN \ - pip3 install -e ./supervisor \ + pip3 install --no-cache-dir -e ./supervisor \ && python3 -m compileall ./supervisor/supervisor diff --git a/build.yaml b/build.yaml index 2a16ba0a5..d3caed148 100644 --- a/build.yaml +++ b/build.yaml @@ -1,10 +1,10 @@ image: ghcr.io/home-assistant/{arch}-hassio-supervisor build_from: - aarch64: ghcr.io/home-assistant/aarch64-base-python:3.11-alpine3.18 - armhf: ghcr.io/home-assistant/armhf-base-python:3.11-alpine3.18 - armv7: ghcr.io/home-assistant/armv7-base-python:3.11-alpine3.18 - amd64: ghcr.io/home-assistant/amd64-base-python:3.11-alpine3.18 - i386: ghcr.io/home-assistant/i386-base-python:3.11-alpine3.18 + aarch64: ghcr.io/home-assistant/aarch64-base-python:3.11-alpine3.16 + armhf: ghcr.io/home-assistant/armhf-base-python:3.11-alpine3.16 + armv7: ghcr.io/home-assistant/armv7-base-python:3.11-alpine3.16 + amd64: ghcr.io/home-assistant/amd64-base-python:3.11-alpine3.16 + i386: ghcr.io/home-assistant/i386-base-python:3.11-alpine3.16 codenotary: signer: notary@home-assistant.io base_image: notary@home-assistant.io