From 77bde3e7dcfb771c2062a91f4b85610e390a08c3 Mon Sep 17 00:00:00 2001
From: Michael Hansen <mike@rhasspy.org>
Date: Mon, 6 Nov 2023 14:26:05 -0600
Subject: [PATCH] Fix docker build

---
 .dockerignore |  4 +---
 Dockerfile    | 47 ++++++++++-------------------------------------
 2 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index d63fb2a..ecfbbfb 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,6 +1,4 @@
 *
 !VERSION
-!Makefile
 !src/cpp/
-!local/en-us/lessac/low/en-us-lessac-low.onnx
-!local/en-us/lessac/low/en-us-lessac-low.onnx.json
+!CMakeLists.txt
diff --git a/Dockerfile b/Dockerfile
index 36a9168..de2718b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,47 +1,20 @@
-FROM quay.io/pypa/manylinux_2_28_x86_64 as build-amd64
-
-FROM quay.io/pypa/manylinux_2_28_aarch64 as build-arm64
-
-FROM debian:bullseye as build-armv7
-
-RUN apt-get update && \
-    apt-get install --yes --no-install-recommends \
-        build-essential cmake ca-certificates curl pkg-config
-
-# -----------------------------------------------------------------------------
-
-ARG TARGETARCH
-ARG TARGETVARIANT
-FROM build-${TARGETARCH}${TARGETVARIANT} as build
+FROM debian:bullseye as build
 ARG TARGETARCH
 ARG TARGETVARIANT
 
 ENV LANG C.UTF-8
 ENV DEBIAN_FRONTEND=noninteractive
 
-WORKDIR /build
-
-ARG SPDLOG_VERSION="1.11.0"
-RUN curl -L "https://github.com/gabime/spdlog/archive/refs/tags/v${SPDLOG_VERSION}.tar.gz" | \
-    tar -xzvf - && \
-    mkdir -p "spdlog-${SPDLOG_VERSION}/build" && \
-    cd "spdlog-${SPDLOG_VERSION}/build" && \
-    cmake ..  && \
-    make -j8 && \
-    cmake --install . --prefix /usr
-
-RUN mkdir -p "lib/Linux-$(uname -m)"
+RUN apt-get update && \
+    apt-get install --yes --no-install-recommends \
+        build-essential cmake ca-certificates curl pkg-config git
 
-# Use pre-compiled Piper phonemization library (includes onnxruntime)
-ARG PIPER_PHONEMIZE_VERSION='1.1.0'
-RUN mkdir -p "lib/Linux-$(uname -m)/piper_phonemize" && \
-    curl -L "https://github.com/rhasspy/piper-phonemize/releases/download/v${PIPER_PHONEMIZE_VERSION}/libpiper_phonemize-${TARGETARCH}${TARGETVARIANT}.tar.gz" | \
-        tar -C "lib/Linux-$(uname -m)/piper_phonemize" -xzvf -
+WORKDIR /build
 
-# Build piper binary
-COPY VERSION Makefile ./
-COPY src/cpp/ ./src/cpp/
-RUN make
+COPY ./ ./
+RUN cmake -Bbuild -DCMAKE_INSTALL_PREFIX=install
+RUN cmake --build build --config Release
+RUN cmake --install build
 
 # Do a test run
 RUN ./build/piper --help
@@ -49,7 +22,7 @@ RUN ./build/piper --help
 # Build .tar.gz to keep symlinks
 WORKDIR /dist
 RUN mkdir -p piper && \
-    cp -dR /build/build/*.so* /build/build/espeak-ng-data /build/build/libtashkeel_model.ort /build/build/piper ./piper/ && \
+    cp -dR /build/install/* ./piper/ && \
     tar -czf "piper_${TARGETARCH}${TARGETVARIANT}.tar.gz" piper/
 
 # -----------------------------------------------------------------------------