Skip to content
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

add: DockerHub で提供されているイメージに arm 版を追加 #639

Merged
merged 4 commits into from
Mar 29, 2023
Merged

add: DockerHub で提供されているイメージに arm 版を追加 #639

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ba6523c
add: arm64 support
K-shir0 Mar 26, 2023
9da61cc
fix: format
K-shir0 Mar 27, 2023
b41ce05
add: それぞれのアーキテクチャでビルドしそれを統合する形に変更
K-shir0 Mar 27, 2023
6977fdf
Revert "add: それぞれのアーキテクチャでビルドしそれを統合する形に変更"
K-shir0 Mar 28, 2023
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
157 changes: 154 additions & 3 deletions .github/workflows/build-docker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,55 +36,114 @@ jobs:
- nvidia-ubuntu20.04
- cpu-ubuntu18.04
- nvidia-ubuntu18.04
tag_platform_prefix:
- amd64
- arm64
exclude:
- tag: nvidia
tag_platform_prefix: arm64
- tag: nvidia-ubuntu20.04
tag_platform_prefix: arm64
- tag: nvidia-ubuntu18.04
tag_platform_prefix: arm64
include:
# Ubuntu 20.04
- tag: ""
tag_platform_prefix: amd64
target: runtime-env
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.13.1/onnxruntime-linux-x64-1.13.1.tgz
platforms: linux/amd64
- tag: ""
tag_platform_prefix: arm64
target: runtime-env
base_image: ubuntu:20.04
base_runtime_image: ubuntu:20.04
voicevox_core_asset_prefix: voicevox_core-linux-arm64-cpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.14.1/onnxruntime-linux-aarch64-1.14.1.tgz
platforms: linux/arm64/v8
- tag: cpu
tag_platform_prefix: amd64
target: runtime-env
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.13.1/onnxruntime-linux-x64-1.13.1.tgz
platforms: linux/amd64
- tag: cpu
tag_platform_prefix: arm64
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

最後につけてるのでpostfixかも。
あと「プットフォームのタグのpostfix」とすると意味が通りやすいので、platform tag postfixにすると他と揃うかも…？（微妙かも……）

target: runtime-env
base_image: ubuntu:20.04
base_runtime_image: ubuntu:20.04
voicevox_core_asset_prefix: voicevox_core-linux-arm64-cpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.14.1/onnxruntime-linux-aarch64-1.14.1.tgz
platforms: linux/arm64/v8
- tag: cpu-ubuntu20.04
tag_platform_prefix: amd64
target: runtime-env
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.13.1/onnxruntime-linux-x64-1.13.1.tgz
platforms: linux/amd64
- tag: cpu-ubuntu20.04
tag_platform_prefix: arm64
target: runtime-env
base_image: ubuntu:20.04
base_runtime_image: ubuntu:20.04
voicevox_core_asset_prefix: voicevox_core-linux-arm64-cpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.14.1/onnxruntime-linux-aarch64-1.14.1.tgz
platforms: linux/arm64/v8
- tag: nvidia
tag_platform_prefix: amd64
target: runtime-nvidia-env
base_image: ubuntu:20.04
base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.13.1/onnxruntime-linux-x64-gpu-1.13.1.tgz
platforms: linux/amd64
- tag: nvidia-ubuntu20.04
tag_platform_prefix: amd64
target: runtime-nvidia-env
base_image: ubuntu:20.04
base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.13.1/onnxruntime-linux-x64-gpu-1.13.1.tgz
platforms: linux/amd64
# Ubuntu 18.04
- tag: cpu-ubuntu18.04
tag_platform_prefix: amd64
target: runtime-env
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.13.1/onnxruntime-linux-x64-1.13.1.tgz
platforms: linux/amd64
- tag: cpu-ubuntu18.04
tag_platform_prefix: arm64
target: runtime-env
base_image: ubuntu:18.04
base_runtime_image: ubuntu:18.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-cpu
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

arm64かもです

onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.14.1/onnxruntime-linux-aarch64-1.14.1.tgz
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

バージョン合わせておくと環境ごとの差異なくせて良いかも？

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

完全に僕の転記ミスです🙇‍♂️

platforms: linux/arm64/v8
- tag: nvidia-ubuntu18.04
tag_platform_prefix: amd64
target: runtime-nvidia-env
base_image: ubuntu:18.04
base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu18.04
voicevox_core_asset_prefix: voicevox_core-linux-x64-gpu
onnxruntime_url: https://github.com/microsoft/onnxruntime/releases/download/v1.13.1/onnxruntime-linux-x64-gpu-1.13.1.tgz
platforms: linux/amd64

steps:
- uses: actions/checkout@v3

- name: Setup QEMU
uses: docker/setup-qemu-action@v2

- name: Setup Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2
Expand Down Expand Up @@ -144,6 +203,98 @@ jobs:
ONNXRUNTIME_URL=${{ matrix.onnxruntime_url }}
target: ${{ matrix.target }}
push: true
tags: ${{ env.IMAGE_TAG }}
cache-from: type=registry,ref=${{ env.IMAGE_TAG }}-buildcache
cache-to: type=registry,ref=${{ env.IMAGE_TAG }}-buildcache,mode=max
tags: ${{ env.IMAGE_TAG }}-${{ matrix.tag_platform_prefix }}
cache-from: type=registry,ref=${{ env.IMAGE_TAG }}-${{ matrix.tag_platform_prefix }}-buildcache
cache-to: type=registry,ref=${{ env.IMAGE_TAG }}-${{ matrix.tag_platform_prefix }}-buildcache,mode=max
platforms: ${{ matrix.platforms }}

create-manifests:
runs-on: [ ubuntu-latest ]
needs: build-docker

steps:
- uses: actions/checkout@v3

- name: Setup Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v2

- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

# Tag ""
- name: Create and push manifest for ""
env:
TAG: ${{ env.IMAGE_NAME }}:${{ env.VOICEVOX_ENGINE_VERSION }}
run: |
docker manifest create \
${{ env.TAG }} \
--amend ${{ env.TAG }}-amd64 \
--amend ${{ env.TAG }}-arm64
docker manifest push ${{ env.TAG }}

# Tag "cpu"
- name: Create and push manifest for "cpu"
env:
TAG: ${{ env.IMAGE_NAME }}:cpu-${{ env.VOICEVOX_ENGINE_VERSION }}
run: |
docker manifest create \
${{ env.TAG }} \
--amend ${{ env.TAG }}-amd64 \
--amend ${{ env.TAG }}-arm64
docker manifest push ${{ env.TAG }}

# Tag "cpu-ubuntu20.04"
- name: Create and push manifest for "cpu-ubuntu20.04"
env:
TAG: ${{ env.IMAGE_NAME }}:cpu-ubuntu20.04-${{ env.VOICEVOX_ENGINE_VERSION }}
run: |
docker manifest create \
${{ env.TAG }} \
--amend ${{ env.TAG }}-amd64 \
--amend ${{ env.TAG }}-arm64
docker manifest push ${{ env.TAG }}

# Tag "nvidia"
- name: Create and push manifest for "nvidia"
env:
TAG: ${{ env.IMAGE_NAME }}:nvidia-${{ env.VOICEVOX_ENGINE_VERSION }}
run: |
docker manifest create \
${{ env.TAG }} \
--amend ${{ env.TAG }}-amd64
docker manifest push ${{ env.TAG }}

# Tag "nvidia-ubuntu20.04"
- name: Create and push manifest for "nvidia-ubuntu20.04"
env:
TAG: ${{ env.IMAGE_NAME }}:nvidia-ubuntu20.04-${{ env.VOICEVOX_ENGINE_VERSION }}
run: |
docker manifest create \
${{ env.TAG }} \
--amend ${{ env.TAG }}-amd64
docker manifest push ${{ env.TAG }}

# Tag "cpu-ubuntu18.04"
- name: Create and push manifest for "cpu-ubuntu18.04"
env:
TAG: ${{ env.IMAGE_NAME }}:cpu-ubuntu18.04-${{ env.VOICEVOX_ENGINE_VERSION }}
run: |
docker manifest create \
${{ env.TAG }} \
--amend ${{ env.TAG }}-amd64 \
--amend ${{ env.TAG }}-arm64
docker manifest push ${{ env.TAG }}

# Tag "nvidia-ubuntu18.04"
- name: Create and push manifest for "nvidia-ubuntu18.04"
env:
TAG: ${{ env.IMAGE_NAME }}:nvidia-ubuntu18.04-${{ env.VOICEVOX_ENGINE_VERSION }}
run: |
docker manifest create \
${{ env.TAG }} \
--amend ${{ env.TAG }}-amd64
docker manifest push ${{ env.TAG }}