build!: DockerではPyinstallerビルドのエンジンを用いる (#1669)

Co-authored-by: Hiroshiba <[email protected]>

Author: qryxip

.github/actions/prepare_python/action.yml

@@ -5,10 +5,6 @@ inputs:
   dependency-group:
     description: "uv の依存パッケージインストール時に指定するグループ"
     required: false
-outputs:
-  python-version:
-    description: "Python version"
-    value: ${{ steps.export-python-version.outputs.python-version }}
 
 runs:
   using: "composite"
@@ -26,12 +22,3 @@ runs:
           uv sync
         fi
       shell: bash
-
-    - name: <Deploy> Export Python version
-      id: export-python-version
-      run: |
-        PYTHON_VERSION=$(
-          uv run python -c 'import platform; print(platform.python_version())'
-        )
-        echo "python-version=${PYTHON_VERSION}" >> "$GITHUB_OUTPUT"
-      shell: bash

.github/workflows/build-engine-container.yml

@@ -3,9 +3,10 @@ on:
   # FIXME: デフォルトブランチへのpush時にビルドをテストする
   # https://github.com/VOICEVOX/voicevox_engine/pull/1669#discussion_r2076730954
   workflow_call:
-  release:
-    types:
-      - created
+    inputs:
+      version:
+        type: string
+        required: true
   workflow_dispatch:
     inputs:
       version:
@@ -15,8 +16,6 @@ on:
 env:
   IMAGE_NAME: ${{ vars.DOCKERHUB_USERNAME }}/voicevox_engine
   VOICEVOX_RESOURCE_VERSION: "0.23.0"
-  VOICEVOX_CORE_VERSION: "0.15.7"
-  ONNXRUNTIME_VERSION: "1.13.1"
 
 defaults:
   run:
@@ -45,8 +44,7 @@ jobs:
         # prefixes: Docker tagのプレフィックス。カンマ区切り。空文字列の場合、バージョン文字列のみがタグ名になる
         # buildcache_prefix: ビルドキャッシュのプレフィックス。空文字列やカンマは使用不可
         # target: Dockerfileのビルドステージ名
-        # base_image: Dockerfileのビルド用ステージのベースイメージ
-        # base_runtime_image: Dockerfileの実行用ステージのベースイメージ
+        # base_image: Dockerfileのベースイメージ
         # platforms: Dockerのプラットフォームバリアント。カンマ区切り。 参考: https://docs.docker.com/build/building/multi-platform/
         include:
           # Ubuntu 20.04 / AMD64
@@ -55,55 +53,54 @@ jobs:
             buildcache_prefix: "cpu-amd64-ubuntu20.04"
             target: runtime-env
             base_image: mirror.gcr.io/ubuntu:20.04
-            base_runtime_image: mirror.gcr.io/ubuntu:20.04
+            voicevox_engine_target: linux-cpu-x64
             platforms: linux/amd64
           # Ubuntu 20.04 / ARM64
           - os: ubuntu-24.04-arm
             prefixes: "cpu-arm64-ubuntu20.04"
             buildcache_prefix: "cpu-arm64-ubuntu20.04"
             target: runtime-env
             base_image: mirror.gcr.io/ubuntu:20.04
-            base_runtime_image: mirror.gcr.io/ubuntu:20.04
+            voicevox_engine_target: linux-cpu-arm64
             platforms: linux/arm64/v8
           # Ubuntu 20.04 / AMD64 / NVIDIA
           - os: ubuntu-latest
             prefixes: "nvidia-ubuntu20.04,nvidia-amd64-ubuntu20.04"
             buildcache_prefix: "nvidia-amd64-ubuntu20.04"
             target: runtime-nvidia-env
             base_image: mirror.gcr.io/ubuntu:20.04
-            base_runtime_image: mirror.gcr.io/nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu20.04
+            voicevox_engine_target: linux-nvidia
             platforms: linux/amd64
           # Ubuntu 22.04 / AMD64
           - os: ubuntu-latest
             prefixes: "cpu-amd64,cpu-amd64-ubuntu22.04"
             buildcache_prefix: "cpu-amd64-ubuntu22.04"
             target: runtime-env
             base_image: mirror.gcr.io/ubuntu:22.04
-            base_runtime_image: mirror.gcr.io/ubuntu:22.04
+            voicevox_engine_target: linux-cpu-x64
             platforms: linux/amd64
           # Ubuntu 22.04 / ARM64
           - os: ubuntu-24.04-arm
             prefixes: "cpu-arm64,cpu-arm64-ubuntu22.04"
             buildcache_prefix: "cpu-arm64-ubuntu22.04"
             target: runtime-env
             base_image: mirror.gcr.io/ubuntu:22.04
-            base_runtime_image: mirror.gcr.io/ubuntu:22.04
+            voicevox_engine_target: linux-cpu-arm64
             platforms: linux/arm64/v8
           # Ubuntu 22.04 / AMD64 / NVIDIA
           - os: ubuntu-latest
             prefixes: "nvidia,nvidia-amd64,nvidia-ubuntu22.04,nvidia-amd64-ubuntu22.04"
             buildcache_prefix: "nvidia-amd64-ubuntu22.04"
             target: runtime-nvidia-env
             base_image: mirror.gcr.io/ubuntu:22.04
-            base_runtime_image: mirror.gcr.io/nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu22.04
+            voicevox_engine_target: linux-nvidia
             platforms: linux/amd64
 
     steps:
       - name: <Setup> Check out the repository
         uses: actions/checkout@v4
 
-      - name: <Setup> Prepare Python version
-        id: prepare-python
+      - name: <Setup> Prepare Python
         uses: ./.github/actions/prepare_python
 
       - name: <Setup> Set up Docker Buildx
@@ -116,26 +113,6 @@ jobs:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: <Setup> Prepare VOICEVOX RESOURCE cache
-        uses: actions/cache@v4
-        id: voicevox-resource-cache
-        with:
-          key: voicevox-resource-${{ env.VOICEVOX_RESOURCE_VERSION }}
-          path: download/resource
-
-      - name: <Setup> Check out the VOICEVOX RESOURCE repository
-        if: steps.voicevox-resource-cache.outputs.cache-hit != 'true'
-        uses: actions/checkout@v4
-        with:
-          repository: VOICEVOX/voicevox_resource
-          ref: ${{ env.VOICEVOX_RESOURCE_VERSION }}
-          path: download/resource
-
-      - name: <Build> Merge VOICEVOX RESOURCE
-        env:
-          DOWNLOAD_RESOURCE_PATH: download/resource
-        run: bash tools/process_voicevox_resource.bash
-
       - name: <Build> Generate Docker image names
         id: generate-docker-image-names
         run: |
@@ -181,13 +158,9 @@ jobs:
           file: ./Dockerfile
           build-args: |
             BASE_IMAGE=${{ matrix.base_image }}
-            BASE_RUNTIME_IMAGE=${{ matrix.base_runtime_image }}
-            PYTHON_VERSION=${{ steps.prepare-python.outputs.python-version }}
             VOICEVOX_ENGINE_VERSION=${{ needs.config.outputs.version }}
-            VOICEVOX_CORE_VERSION=${{ env.VOICEVOX_CORE_VERSION }}
+            VOICEVOX_ENGINE_TARGET=${{ matrix.voicevox_engine_target }}
             VOICEVOX_RESOURCE_VERSION=${{ env.VOICEVOX_RESOURCE_VERSION }}
-            USE_GPU=${{ matrix.target == 'runtime-nvidia-env' }}
-            ONNXRUNTIME_VERSION=${{ env.ONNXRUNTIME_VERSION }}
           target: ${{ matrix.target }}
           push: true
           tags: ${{ steps.generate-docker-image-names.outputs.tags }}
@@ -215,8 +188,7 @@ jobs:
       - name: <Setup> Check out the repository
         uses: actions/checkout@v4
 
-      - name: <Setup> Prepare Python version
-        id: prepare-python
+      - name: <Setup> Prepare Python
         uses: ./.github/actions/prepare_python
 
       - name: <Setup> Set up Docker Buildx

…ithub/workflows/build-engine-package.yml .github/workflows/build-engine.yml.github/workflows/build-engine-package.yml renamed to .github/workflows/build-engine.yml .github/workflows/build-engine-package.yml renamed to .github/workflows/build-engine.yml

@@ -662,3 +662,10 @@ jobs:
     with:
       version: ${{ needs.config.outputs.version }}
       repo_url: ${{ format('{0}/{1}', github.server_url, github.repository) }} # このリポジトリのURL
+
+  run-build-engine-container-workflow:
+    if: needs.config.outputs.version != ''
+    needs: [config, run-release-test-workflow]
+    uses: ./.github/workflows/build-engine-container.yml
+    with:
+      version: ${{ needs.config.outputs.version }}

.github/workflows/build-latest-dev.yml

@@ -30,20 +30,11 @@ jobs:
             github.rest.actions.createWorkflowDispatch({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              workflow_id: 'build-engine-package.yml',
+              workflow_id: 'build-engine.yml',
               ref: 'master',
               inputs: {
                 version: dev_version,
                 prerelease: true,
               },
             });
-            github.rest.actions.createWorkflowDispatch({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: 'build-engine-container.yml',
-              ref: 'master',
-              inputs: {
-                version: dev_version,
-              },
-            });
             console.log(`Triggered workflow_dispatch for ${dev_version}`);

CONTRIBUTING.md

@@ -248,7 +248,7 @@ uv lock --upgrade # 全部更新
 
 #### パッケージ情報を pip requirements.txt ファイルへ反映する
 
-Docker 用に requirements.txt ファイルを用意しています。
+pip-audit のために requirements.txt ファイルを用意しています。
 
 ```bash
 uv export --no-annotate --no-hashes --no-header -o requirements.txt # こちらを更新する場合は下２つも更新する必要があります。
@@ -361,7 +361,7 @@ TODO: Docker 版のビルド手順を GitHub Actions をベースに記述する
 
 ### Github Actions でビルド
 
-fork したリポジトリで Actions を ON にし、workflow_dispatch で`build-engine-package.yml`を起動すればビルドできます。
+fork したリポジトリで Actions を ON にし、workflow_dispatch で`build-engine.yml`を起動すればビルドできます。
 成果物は Release にアップロードされます。
 
 ### API ドキュメントの確認