Fix merge conflict

Author: kprinssu

.github/workflows/ci.yml

@@ -21,10 +21,13 @@ jobs:
         sudo apt-get update
         sudo apt-get install -y --no-install-recommends \
           espeak-ng \
+          espeak-ng-data \
           git \
           libsndfile1 \
           curl \
-          ffmpeg
+          ffmpeg \
+          g++ \
+          cmake
     
     - name: Install uv
       uses: astral-sh/setup-uv@v5

.github/workflows/release.yml

@@ -33,11 +33,14 @@ jobs:
     env:
       DOCKER_BUILDKIT: 1
       BUILDKIT_STEP_LOG_MAX_SIZE: 10485760
-      # This environment variable will override the VERSION variable in docker-bake.hcl
+      # These environment variables will override the defaults within docker-bake.hcl
       VERSION: ${{ needs.prepare-release.outputs.version_tag }} # Use tag version (vX.Y.Z) for bake
     strategy:
       matrix:
         build_target: ["cpu", "cpu-arm64", "gpu-arm64", "gpu"]
+      REGISTRY: ${{ vars.REGISTRY || 'ghcr.io' }} # Override with GitHub Action Environment Variable
+      OWNER: ${{ vars.OWNER || 'remsky' }}
+      REPO: ${{ vars.REPO || 'kokoro-fastapi' }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

README.md

@@ -661,3 +661,15 @@ This project is licensed under the Apache License 2.0 - see below for details:
 
 The full Apache 2.0 license text can be found at: https://www.apache.org/licenses/LICENSE-2.0
 </details>
+
+</details open>
+
+## Contributor Stats
+![Alt](https://repobeats.axiom.co/api/embed/f9694366bf96febc749d592316ff0a275fe77219.svg "Repobeats analytics image")
+</details>
+
+<a href="https://github.com/remsky/Kokoro-FastAPI/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=remsky/Kokoro-FastAPI" />
+</a>
+
+Made with [contrib.rocks](https://contrib.rocks).

docker/cpu/Dockerfile

@@ -3,7 +3,7 @@ FROM python:3.10-slim
 # Install dependencies and check espeak location
 # Rust is required to build sudachipy and pyopenjtalk-plus
 RUN apt-get update -y &&  \
-    apt-get install -y espeak-ng espeak-ng-data git libsndfile1 curl ffmpeg g++ && \
+    apt-get install -y espeak-ng espeak-ng-data git libsndfile1 curl ffmpeg g++ cmake && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
     mkdir -p /usr/share/espeak-ng-data && \
     ln -s /usr/lib/*/espeak-ng-data/* /usr/share/espeak-ng-data/ && \

docker/gpu/Dockerfile

@@ -2,7 +2,7 @@ FROM --platform=$BUILDPLATFORM nvcr.io/nvidia/cuda:12.9.1-cudnn-devel-ubuntu24.0
 
 # Install Python and other dependencies
 RUN apt-get update -y &&  \
-    apt-get install -y python3.10 python3-venv espeak-ng espeak-ng-data git libsndfile1 curl ffmpeg g++ &&  \
+    apt-get install -y python3.10 python3-venv espeak-ng espeak-ng-data git libsndfile1 curl ffmpeg g++ cmake && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
     mkdir -p /usr/share/espeak-ng-data &&  \
     ln -s /usr/lib/*/espeak-ng-data/* /usr/share/espeak-ng-data/ && \

start-gpu.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Get project root directory
 PROJECT_ROOT=$(pwd)