add: DockerビルドのデフォルトのタグをUbuntu 22.04ベースのイメージに切り替える (#1505)

* build-engine-container.yml: デフォルトのタグをUbuntu 22.04に切り替える * README.md: Dockerイメージの案内をUbuntu 22.04ベースイメージに変更 * fix: Ubuntu 22.04のタグを最新のものに更新し、CI設定を整理 --------- Co-authored-by: Hiroshiba <[email protected]>
VOICEVOX · Dec 15, 2024 · f6788a1 · f6788a1
1 parent a000c66
commit f6788a1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build-engine-container.yml b/.github/workflows/build-engine-container.yml
@@ -49,29 +49,29 @@ jobs:
         # platforms: Dockerのプラットフォームバリアント。カンマ区切り。 参考: https://docs.docker.com/build/building/multi-platform/
         include:
           # Ubuntu 20.04
-          - prefixes: ",cpu,cpu-ubuntu20.04"
+          - prefixes: "cpu-ubuntu20.04"
             buildcache_prefix: "cpu-ubuntu20.04"
             target: runtime-env
             base_image: ubuntu:20.04
             base_runtime_image: ubuntu:20.04
             onnxruntime_version: 1.13.1
             platforms: linux/amd64,linux/arm64/v8
-          - prefixes: "nvidia,nvidia-ubuntu20.04"
+          - prefixes: "nvidia-ubuntu20.04"
             buildcache_prefix: "nvidia-ubuntu20.04"
             target: runtime-nvidia-env
             base_image: ubuntu:20.04
             base_runtime_image: nvidia/cuda:11.8.0-cudnn8-runtime-ubuntu20.04
             onnxruntime_version: 1.13.1
             platforms: linux/amd64
           # Ubuntu 22.04
-          - prefixes: "cpu-ubuntu22.04"
+          - prefixes: ",cpu,cpu-ubuntu22.04"
             buildcache_prefix: "cpu-ubuntu22.04"
             target: runtime-env
             base_image: ubuntu:22.04
             base_runtime_image: ubuntu:22.04
             onnxruntime_version: 1.13.1
             platforms: linux/amd64,linux/arm64/v8
-          - prefixes: "nvidia-ubuntu22.04"
+          - prefixes: "nvidia,nvidia-ubuntu22.04"
             buildcache_prefix: "nvidia-ubuntu22.04"
             target: runtime-nvidia-env
             base_image: ubuntu:22.04

diff --git a/README.md b/README.md
@@ -43,15 +43,15 @@ VOICEVOX エンジンもしくはエディタを起動した状態で http://127
 #### CPU
 
 ```bash
-docker pull voicevox/voicevox_engine:cpu-ubuntu20.04-latest
-docker run --rm -p '127.0.0.1:50021:50021' voicevox/voicevox_engine:cpu-ubuntu20.04-latest
+docker pull voicevox/voicevox_engine:cpu-latest
+docker run --rm -p '127.0.0.1:50021:50021' voicevox/voicevox_engine:cpu-latest
 ```
 
 #### GPU
 
 ```bash
-docker pull voicevox/voicevox_engine:nvidia-ubuntu20.04-latest
-docker run --rm --gpus all -p '127.0.0.1:50021:50021' voicevox/voicevox_engine:nvidia-ubuntu20.04-latest
+docker pull voicevox/voicevox_engine:nvidia-latest
+docker run --rm --gpus all -p '127.0.0.1:50021:50021' voicevox/voicevox_engine:nvidia-latest
 ```
 
 ##### トラブルシューティング