Skip to content

Docker: ベースイメージのタグ名をコードネームからバージョン番号に変更する #517

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Hiroshiba merged 2 commits into from
Dec 4, 2022
Merged

Docker: ベースイメージのタグ名をコードネームからバージョン番号に変更する #517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a3e9c6
replace bionic/focal to 18.04/20.04
aoirint Dec 3, 2022
c2104b5
Merge branch 'master' into patch-docker-ubuntu-version-numeric
aoirint Dec 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/build-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,44 +40,44 @@ jobs:
# Ubuntu 20.04
- tag: ""
target: runtime-env
base_image: ubuntu:focal
base_runtime_image: ubuntu:focal
base_image: ubuntu:20.04
base_runtime_image: ubuntu:20.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz
- tag: cpu
target: runtime-env
base_image: ubuntu:focal
base_runtime_image: ubuntu:focal
base_image: ubuntu:20.04
base_runtime_image: ubuntu:20.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz
- tag: cpu-ubuntu20.04
target: runtime-env
base_image: ubuntu:focal
base_runtime_image: ubuntu:focal
base_image: ubuntu:20.04
base_runtime_image: ubuntu:20.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz
- tag: nvidia
target: runtime-nvidia-env
base_image: ubuntu:focal
base_image: ubuntu:20.04
base_runtime_image: nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu20.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-gpu-1.10.0.tgz
- tag: nvidia-ubuntu20.04
target: runtime-nvidia-env
base_image: ubuntu:focal
base_image: ubuntu:20.04
base_runtime_image: nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu20.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-gpu-1.10.0.tgz
# Ubuntu 18.04
- tag: cpu-ubuntu18.04
target: runtime-env
base_image: ubuntu:bionic
base_runtime_image: ubuntu:bionic
base_image: ubuntu:18.04
base_runtime_image: ubuntu:18.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz
- tag: nvidia-ubuntu18.04
target: runtime-nvidia-env
base_image: ubuntu:bionic
base_image: ubuntu:18.04
base_runtime_image: nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu18.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-gpu-1.10.0.tgz
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.4

ARG BASE_IMAGE=ubuntu:focal
ARG BASE_IMAGE=ubuntu:20.04
ARG BASE_RUNTIME_IMAGE=$BASE_IMAGE

# Download VOICEVOX Core shared object
Expand Down
18 changes: 9 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ build-linux-docker-ubuntu20.04:
-t voicevox/voicevox_engine:cpu-ubuntu20.04-latest \
--target runtime-env \
--progress plain \
--build-arg BASE_IMAGE=ubuntu:focal \
--build-arg BASE_RUNTIME_IMAGE=ubuntu:focal \
--build-arg BASE_IMAGE=ubuntu:20.04 \
--build-arg BASE_RUNTIME_IMAGE=ubuntu:20.04 \
--build-arg ONNXRUNTIME_URL=https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz \
--build-arg VOICEVOX_CORE_LIBRARY_NAME=libcore_cpu_x64.so $(ARGS)

Expand All @@ -30,7 +30,7 @@ build-linux-docker-nvidia-ubuntu20.04:
-t voicevox/voicevox_engine:nvidia-ubuntu20.04-latest \
--target runtime-nvidia-env \
--progress plain \
--build-arg BASE_IMAGE=ubuntu:focal \
--build-arg BASE_IMAGE=ubuntu:20.04 \
--build-arg BASE_RUNTIME_IMAGE=nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu20.04 \
--build-arg ONNXRUNTIME_URL=https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-gpu-1.10.0.tgz \
--build-arg VOICEVOX_CORE_LIBRARY_NAME=libcore_gpu_x64_nvidia.so $(ARGS)
Expand All @@ -50,8 +50,8 @@ build-linux-docker-ubuntu18.04:
-t voicevox/voicevox_engine:cpu-ubuntu18.04-latest \
--target runtime-env \
--progress plain \
--build-arg BASE_IMAGE=ubuntu:bionic \
--build-arg BASE_RUNTIME_IMAGE=ubuntu:bionic \
--build-arg BASE_IMAGE=ubuntu:18.04 \
--build-arg BASE_RUNTIME_IMAGE=ubuntu:18.04 \
--build-arg ONNXRUNTIME_URL=https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-1.10.0.tgz \
--build-arg VOICEVOX_CORE_LIBRARY_NAME=libcore_cpu_x64.so $(ARGS)

Expand All @@ -67,7 +67,7 @@ build-linux-docker-nvidia-ubuntu18.04:
-t voicevox/voicevox_engine:nvidia-ubuntu18.04-latest \
--target runtime-nvidia-env \
--progress plain \
--build-arg BASE_IMAGE=ubuntu:bionic \
--build-arg BASE_IMAGE=ubuntu:18.04 \
--build-arg BASE_RUNTIME_IMAGE=nvidia/cuda:11.4.2-cudnn8-runtime-ubuntu18.04 \
--build-arg ONNXRUNTIME_URL=https://github.com/microsoft/onnxruntime/releases/download/v1.10.0/onnxruntime-linux-x64-gpu-1.10.0.tgz \
--build-arg VOICEVOX_CORE_LIBRARY_NAME=libcore_gpu_x64_nvidia.so $(ARGS)
Expand All @@ -87,7 +87,7 @@ build-linux-docker-download-core-env-ubuntu18.04:
-t voicevox/voicevox_engine:download-core-env-ubuntu18.04 \
--target download-core-env \
--progress plain \
--build-arg BASE_IMAGE=ubuntu:bionic $(ARGS)
--build-arg BASE_IMAGE=ubuntu:18.04 $(ARGS)

.PHONY: run-linux-docker-download-core-env-ubuntu18.04
run-linux-docker-download-core-env-ubuntu18.04:
Expand All @@ -102,7 +102,7 @@ build-linux-docker-download-onnxruntime-env-ubuntu18.04:
-t voicevox/voicevox_engine:download-onnxruntime-env-ubuntu18.04 \
--target download-onnxruntime-env \
--progress plain \
--build-arg BASE_IMAGE=ubuntu:bionic $(ARGS)
--build-arg BASE_IMAGE=ubuntu:18.04 $(ARGS)

.PHONY: run-linux-docker-download-onnxruntime-env-ubuntu18.04
run-linux-docker-download-onnxruntime-env-ubuntu18.04:
Expand All @@ -117,7 +117,7 @@ build-linux-docker-compile-python-env:
-t voicevox/voicevox_engine:compile-python-env \
--target compile-python-env \
--progress plain \
--build-arg BASE_IMAGE=ubuntu:focal $(ARGS)
--build-arg BASE_IMAGE=ubuntu:20.04 $(ARGS)

.PHONY: run-linux-docker-compile-python-env
run-linux-docker-compile-python-env:
Expand Down