From 8e0311a3d6a1efec77fd2bcf24d5c4ddefee975d Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Tue, 27 Jun 2023 23:26:53 +0200
Subject: [PATCH] matter_server: Bump Python Matter server to 3.5.2 (#3112)

* matter_server: Bump Python Matter server to 3.5.2

With this upgrade also use the Python Matter container image as base
for this add-on.

* Bump version in config.yaml
---
 matter_server/CHANGELOG.md |  5 +++++
 matter_server/Dockerfile   | 21 +--------------------
 matter_server/build.yaml   |  5 ++---
 matter_server/config.yaml  |  2 +-
 4 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/matter_server/CHANGELOG.md b/matter_server/CHANGELOG.md
index 56930c74c56..0c690460b18 100644
--- a/matter_server/CHANGELOG.md
+++ b/matter_server/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.7.0
+
+- Use the Python Matter Server container as base
+- Bump Python Matter Server to [3.5.2](https://github.com/home-assistant-libs/python-matter-server/releases/tag/3.5.2)
+
 ## 4.6.1
 
 - Bump Python Matter Server to [3.5.1](https://github.com/home-assistant-libs/python-matter-server/releases/tag/3.5.1)
diff --git a/matter_server/Dockerfile b/matter_server/Dockerfile
index 49d7ff46b89..135f97efc13 100644
--- a/matter_server/Dockerfile
+++ b/matter_server/Dockerfile
@@ -18,8 +18,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 ARG \
     BASHIO_VERSION \
     TEMPIO_VERSION \
-    S6_OVERLAY_VERSION \
-    QEMU_CPU
+    S6_OVERLAY_VERSION
 
 # Base system
 WORKDIR /usr/src
@@ -74,22 +73,4 @@ RUN \
 WORKDIR /root
 ENTRYPOINT ["/init"]
 
-ARG MATTER_SERVER_VERSION
-
-RUN \
-    set -x \
-    && apt-get update \
-    && apt-get install -y --no-install-recommends \
-       libuv1 \
-       openssl \
-       zlib1g \
-       libjson-c5 \
-       libnl-3-200 \
-       libnl-route-3-200 \
-       unzip \
-       gdb \
-    && pip3 install --no-cache-dir "python-matter-server[server]==${MATTER_SERVER_VERSION}" \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -rf /usr/src/*
-
 COPY rootfs /
diff --git a/matter_server/build.yaml b/matter_server/build.yaml
index da62d2b6a82..35e72297869 100644
--- a/matter_server/build.yaml
+++ b/matter_server/build.yaml
@@ -1,9 +1,8 @@
 ---
 build_from:
-  aarch64: python:3.11-slim-bullseye
-  amd64: python:3.11-slim-bullseye
+  aarch64: ghcr.io/home-assistant-libs/python-matter-server:3.5.2
+  amd64: ghcr.io/home-assistant-libs/python-matter-server:3.5.2
 args:
   BASHIO_VERSION: 0.14.3
   TEMPIO_VERSION: 2021.09.0
   S6_OVERLAY_VERSION: 3.1.5.0
-  MATTER_SERVER_VERSION: 3.5.1
diff --git a/matter_server/config.yaml b/matter_server/config.yaml
index 53708ea8b03..0de4932279b 100644
--- a/matter_server/config.yaml
+++ b/matter_server/config.yaml
@@ -1,5 +1,5 @@
 ---
-version: 4.6.1
+version: 4.7.0
 slug: matter_server
 name: Matter Server
 description: Matter WebSocket Server for Home Assistant Matter support.