From 6762a4153a22b8f27ad70c0fa855573376c3f947 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 2 Nov 2023 11:29:15 +0100 Subject: [PATCH] Revert "Revert "Update base images to 3.11-alpine3.18 (#4639)" (#4646)" (#4657) This reverts commit 7c576da32ceef53814e83bdf3d06b416eed7fe9e. With the AppArmor profile updated Supervisor on Alpine 3.18 should work fine now. --- .hadolint.yaml | 1 + Dockerfile | 5 ++--- build.yaml | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.hadolint.yaml b/.hadolint.yaml index 2cc6e2cac..e689c4a93 100644 --- a/.hadolint.yaml +++ b/.hadolint.yaml @@ -3,4 +3,5 @@ ignored: - DL3006 - DL3013 - DL3018 + - DL3042 - SC2155 diff --git a/Dockerfile b/Dockerfile index a4cf4c8a5..9fec5d658 100644 --- a/Dockerfile +++ b/Dockerfile @@ -32,15 +32,14 @@ RUN \ COPY requirements.txt . RUN \ export MAKEFLAGS="-j$(nproc)" \ - && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links \ - "https://wheels.home-assistant.io/musllinux/" \ + && pip3 install --only-binary=:all: \ -r ./requirements.txt \ && rm -f requirements.txt # Install Home Assistant Supervisor COPY . supervisor RUN \ - pip3 install --no-cache-dir -e ./supervisor \ + pip3 install -e ./supervisor \ && python3 -m compileall ./supervisor/supervisor diff --git a/build.yaml b/build.yaml index d3caed148..2a16ba0a5 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.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 + 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 codenotary: signer: notary@home-assistant.io base_image: notary@home-assistant.io