From 0144e5575530c552256b6e94a30c60da0897be82 Mon Sep 17 00:00:00 2001
From: Marcel van der Veldt <m.vanderveldt@outlook.com>
Date: Sun, 9 Jul 2023 03:08:31 +0200
Subject: [PATCH] try to fix the docker build

---
 .github/workflows/release.yml | 13 +++++++++++++
 Dockerfile                    | 17 +++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d69b3b9a..cb80fd51 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -73,6 +73,19 @@ jobs:
           else
             echo "channel=stable" >> $GITHUB_OUTPUT
           fi
+      - name: Set Python project version from tag
+        shell: python
+        run: |-
+          import tomli
+          import tomli_w
+
+          with open("pyproject.toml", "rb") as f:
+            pyproject = tomli.load(f)
+
+          pyproject["project"]["version"] = "${{ steps.vars.outputs.tag }}"
+
+          with open("pyproject.toml", "wb") as f:
+            tomli_w.dump(pyproject, f)
       - name: Build and Push
         uses: docker/build-push-action@v4.1.1
         with:
diff --git a/Dockerfile b/Dockerfile
index 9c83520a..651a8ba3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 ARG TARGETPLATFORM="linux/amd64"
-ARG MASS_VERSION="2.0.0b43"
+ARG BUILD_VERSION=latest
 ARG PYTHON_VERSION="3.11"
 
 #####################################################################
@@ -28,7 +28,13 @@ COPY requirements_all.txt .
 RUN set -x \
     && pip install --upgrade pip \
     && pip install build maturin \
-    && pip wheel -r requirements_all.txt -w /wheels
+    && pip wheel -r requirements_all.txt
+
+# build music assistant wheel
+COPY music_assistant music_assistant
+COPY pyproject.toml .
+COPY MANIFEST.in .
+RUN python3 -m build --wheel --outdir /wheels --skip-dependency-check
 
 #####################################################################
 #                                                                   #
@@ -63,16 +69,15 @@ RUN set -x \
 RUN --mount=type=bind,target=/tmp/wheels,source=/wheels,from=wheels-builder,rw \
     set -x \
     && pip install --upgrade pip \
-    && pip install --no-cache-dir /tmp/wheels/*.whl \
-    && pip install --no-cache-dir "music-assistant[server]==${MASS_VERSION}"
+    && pip install --no-cache-dir /tmp/wheels/*.whl
 
 # Required to persist build arg
-ARG MASS_VERSION
+ARG BUILD_VERSION
 ARG TARGETPLATFORM
 
 # Set some labels for the Home Assistant add-on
 LABEL \
-    io.hass.version=${MASS_VERSION} \
+    io.hass.version=${BUILD_VERSION} \
     io.hass.name="Music Assistant" \
     io.hass.description="Music Assistant Server/Core" \
     io.hass.platform="${TARGETPLATFORM}" \
-- 
2.34.1