From 4cd2e8846a9e3373a6de87f6f194a6c5492fece5 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Tue, 22 Mar 2022 11:17:10 +0100
Subject: [PATCH] ada: Update to Debian bullseye (#2415)

* Update to Debian bullseye

* Install non-editable

Currently editable installation seems to be broken (Python can't find
the ada module if installed in editable mode).

* Drop ada directory after installation
---
 ada/CHANGELOG.md |  3 +++
 ada/Dockerfile   | 11 +++++------
 ada/build.yaml   |  7 ++++---
 ada/config.yaml  |  3 ++-
 4 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ada/CHANGELOG.md b/ada/CHANGELOG.md
index cb24d61..1e8512e 100644
--- a/ada/CHANGELOG.md
+++ b/ada/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 1.2.0
+- Update to Debian bullseye
+
 ## 1.1.1
 
 - Fix aarch64 support
diff --git a/ada/Dockerfile b/ada/Dockerfile
index 3ba5af0..6d22764 100644
--- a/ada/Dockerfile
+++ b/ada/Dockerfile
@@ -2,7 +2,7 @@ ARG BUILD_FROM
 FROM ${BUILD_FROM}
 
 # Install Ada
-WORKDIR /usr/src/ada
+WORKDIR /usr/src
 ARG ADA_VERSION
 
 RUN apt-get update \
@@ -19,12 +19,11 @@ RUN apt-get update \
         build-essential \
     \
     && git clone --depth 1 -b ${ADA_VERSION} \
-        "https://github.com/home-assistant/ada" . \
-    && rm -rf .git \
+        "https://github.com/home-assistant/ada" \
     && pip3 install --no-cache-dir -U setuptools wheel \
-    && pip3 install --no-cache-dir -r requirements.txt \
-    && pip3 install --no-cache-dir -e . \
-    && python3 -m compileall ada \
+    && pip3 install --no-cache-dir -r ada/requirements.txt \
+    && pip3 install --no-cache-dir ada/ \
+    && rm -rf ada \
     \
     && apt-get purge -y --auto-remove \
         git \
diff --git a/ada/build.yaml b/ada/build.yaml
index 8c7ae54..b6720d5 100644
--- a/ada/build.yaml
+++ b/ada/build.yaml
@@ -1,7 +1,8 @@
 build_from:
-  amd64: ghcr.io/home-assistant/amd64-base-debian:buster
-  armhf: ghcr.io/home-assistant/armhf-base-debian:buster
-  armv7: ghcr.io/home-assistant/armv7-base-debian:buster
+  amd64: ghcr.io/home-assistant/amd64-base-debian:bullseye
+  armhf: ghcr.io/home-assistant/armhf-base-debian:bullseye
+  armv7: ghcr.io/home-assistant/armv7-base-debian:bullseye
+  aarch64: ghcr.io/home-assistant/aarch64-base-debian:bullseye
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
diff --git a/ada/config.yaml b/ada/config.yaml
index bd8bbd2..54a9fbb 100644
--- a/ada/config.yaml
+++ b/ada/config.yaml
@@ -1,4 +1,4 @@
-version: 1.1.1
+version: 1.2.0
 slug: ada
 name: Hey Ada!
 description: Voice assistant powered by Home Assistant
@@ -6,6 +6,7 @@ url: https://github.com/home-assistant/hassio-addons/blob/master/ada
 arch:
   - armhf
   - armv7
+  - aarch64
   - amd64
 audio: true
 homeassistant: 0.102.0