From 25c30afafe1969de75652cf3b99df8e1a216ca8a Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Sun, 12 Dec 2021 20:31:22 -0500
Subject: [PATCH] use the new build.yaml to get HA base version

---
 Dockerfile         | 6 +++---
 Dockerfile.aarch64 | 6 +++---
 Dockerfile.armhf   | 6 +++---
 README.md          | 1 +
 readme-vars.yml    | 1 +
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 4fca0ed..c4ac072 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -70,9 +70,9 @@ RUN \
  tar xf \
   /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) && \
+ HASS_BASE=$(cat /tmp/core/build.yaml \
+  | grep 'amd64: ' \
+  | cut -d: -f3) && \
  mkdir -p /pip-packages && \
  pip install --target /pip-packages --no-cache-dir --upgrade \
   distlib && \
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 3efa5f7..c9e3407 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -70,9 +70,9 @@ RUN \
  tar xf \
   /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) && \
+ HASS_BASE=$(cat /tmp/core/build.yaml \
+  | grep 'amd64: ' \
+  | cut -d: -f3) && \
  pip install --target /pip-packages --no-cache-dir --upgrade \
   distlib && \
  pip install --no-cache-dir --upgrade \
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 8a2577d..8a9977b 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -70,9 +70,9 @@ RUN \
  tar xf \
   /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) && \
+ HASS_BASE=$(cat /tmp/core/build.yaml \
+  | grep 'amd64: ' \
+  | cut -d: -f3) && \
  pip install --target /pip-packages --no-cache-dir --upgrade \
   distlib && \
  pip install --no-cache-dir --upgrade \
diff --git a/README.md b/README.md
index fdbf87f..cda1d99 100644
--- a/README.md
+++ b/README.md
@@ -238,6 +238,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **12.12.21:** - Use the new `build.yaml` to determine HA base version.
 * **25.09.21:** - Use the new lsio homeassistant wheel repo, instead of the HA wheels.
 * **13.09.21:** - Build psycopg locally as the HA provided wheel does not seem to work properly.
 * **13.09.21:** - Fix setcap in service. Build CISO8601 locally as the HA provided wheel does not seem to work properly.
diff --git a/readme-vars.yml b/readme-vars.yml
index dae53ba..162d54a 100644
--- a/readme-vars.yml
+++ b/readme-vars.yml
@@ -59,6 +59,7 @@ unraid_template_sync: false
 
 # changelog
 changelogs:
+  - { date: "12.12.21:", desc: "Use the new `build.yaml` to determine HA base version." }
   - { date: "25.09.21:", desc: "Use the new lsio homeassistant wheel repo, instead of the HA wheels." }
   - { date: "13.09.21:", desc: "Build psycopg locally as the HA provided wheel does not seem to work properly." }
   - { date: "13.09.21:", desc: "Fix setcap in service. Build CISO8601 locally as the HA provided wheel does not seem to work properly." }