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.

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: ubuntu22.04 のサポートを追加 #5

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 27 additions & 10 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- master
- feature/*
release:
types:
- created
Expand Down Expand Up @@ -41,35 +42,50 @@ jobs:
tag:
- ""
- cpu
- cpu-ubuntu20.04
- cpu-ubuntu22.04
- nvidia
- nvidia-ubuntu22.04
- cpu-ubuntu20.04
- nvidia-ubuntu20.04
include:
# Ubuntu 20.04
# Ubuntu 22.04
- tag: ""
target: runtime-env
base_image: ubuntu:20.04
base_runtime_image: ubuntu:20.04
base_image: ubuntu:22.04
base_runtime_image: ubuntu:22.04
onnxruntime_version: 1.13.1
platforms: linux/amd64,linux/arm64/v8
- tag: cpu
target: runtime-env
base_image: ubuntu:20.04
base_runtime_image: ubuntu:20.04
base_image: ubuntu:22.04
base_runtime_image: ubuntu:22.04
onnxruntime_version: 1.13.1
platforms: linux/amd64,linux/arm64/v8
- tag: cpu-ubuntu20.04
- tag: cpu-ubuntu22.04
target: runtime-env
base_image: ubuntu:20.04
base_runtime_image: ubuntu:20.04
base_image: ubuntu:22.04
base_runtime_image: ubuntu:22.04
onnxruntime_version: 1.13.1
platforms: linux/amd64,linux/arm64/v8
- tag: nvidia
target: runtime-nvidia-env
base_image: ubuntu:20.04
base_image: ubuntu:22.04
base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04
onnxruntime_version: 1.13.1
platforms: linux/amd64
- tag: nvidia-ubuntu22.04
target: runtime-nvidia-env
base_image: ubuntu:22.04
base_runtime_image: nvidia/cuda:11.6.2-cudnn8-runtime-ubuntu20.04
onnxruntime_version: 1.13.1
platforms: linux/amd64
# Ubuntu 20.04
- tag: 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
- tag: nvidia-ubuntu20.04
target: runtime-nvidia-env
base_image: ubuntu:20.04
Expand Down Expand Up @@ -131,6 +147,7 @@ jobs:
builder: ${{ steps.buildx.outputs.name }}
file: ./Dockerfile
build-args: |
--progress plain
BASE_IMAGE=${{ matrix.base_image }}
BASE_RUNTIME_IMAGE=${{ matrix.base_runtime_image }}
PYTHON_VERSION=${{ env.PYTHON_VERSION }}
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/release-test-docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
tag:
- ""
- cpu
- cpu-ubuntu22.04
- cpu-ubuntu20.04

steps:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ RUN <<EOF
tk-dev \
libffi-dev \
liblzma-dev \
python-openssl \
python3-openssl \
git
apt-get clean
rm -rf /var/lib/apt/lists/*
Expand Down