diff --git a/.github/workflows/build-docker-gpu.yml b/.github/workflows/build-docker-gpu.yml index 1099b3e..1a6aa11 100644 --- a/.github/workflows/build-docker-gpu.yml +++ b/.github/workflows/build-docker-gpu.yml @@ -39,7 +39,10 @@ jobs: # reserved for vllm: https://github.com/vllm-project/vllm/blob/main/docker/Dockerfile job-cuda_128: name: 'cuda_12.8,cuda,nvidia-cuda' - runs-on: ubuntu-latest + strategy: + matrix: + include: [{arch: amd64, runner: ubuntu-latest}] # , {arch: arm64, runner: ubuntu-24.04-arm} + runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v7 - run: | @@ -52,7 +55,10 @@ jobs: job-cuda_126: name: 'cuda_12.6' - runs-on: ubuntu-latest + strategy: + matrix: + include: [{arch: amd64, runner: ubuntu-latest}] # , {arch: arm64, runner: ubuntu-24.04-arm} + runs-on: ${{ matrix.runner }} steps: - uses: actions/checkout@v7 - run: | @@ -140,7 +146,6 @@ jobs: --build-arg "ARG_PROFILE_NODEJS=base" \ --build-arg "ARG_PROFILE_JAVA=base,maven" \ --build-arg "ARG_PROFILE_LATEX=base,cjk" - alias_image full-cuda-12.8 latest core-cuda latest && push_image cuda job-nvidia-ctk: name: 'nvidia-ctk' @@ -149,7 +154,7 @@ jobs: - uses: actions/checkout@v7 - run: | source ./tool.sh && export IMG_PREFIX_SRC="docker.io/library" - build_image nvidia-ctk latest docker_cuda/nvidia-ctk.Dockerfile && push_image + build_image nvidia-ctk latest docker_cuda/nvidia-ctk.Dockerfile ## Sync all images in this build (listed by "names") to mirror registry. diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 6dae72d..8a5b639 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -28,6 +28,8 @@ env: DOCKER_MIRROR_REGISTRY_USERNAME: ${{ vars.DOCKER_MIRROR_REGISTRY_USERNAME }} DOCKER_MIRROR_REGISTRY_PASSWORD: ${{ secrets.DOCKER_MIRROR_REGISTRY_PASSWORD }} CI_PROJECT_NAME: ${{ vars.CI_PROJECT_NAME || 'LabNow/lab-foundation' }} + DOCKER_PLATFORM: amd64,arm64 + jobs: job-base: @@ -106,7 +108,6 @@ jobs: build_image py-jdk latest docker_core/core.Dockerfile \ --build-arg "ARG_PROFILE_PYTHON=datascience,mkl,database,nlp,cv,chem" \ --build-arg "ARG_PROFILE_JAVA=base" - push_image job-r-base: name: 'r-base' @@ -197,7 +198,6 @@ jobs: --build-arg "ARG_PROFILE_R=base,datascience" \ --build-arg "ARG_PROFILE_NODEJS=base" \ --build-arg "ARG_PROFILE_JULIA=base" - push_image data-science-stack job-full-stack: name: 'full-stack' diff --git a/tool.sh b/tool.sh index 2fb0a37..12ce928 100755 --- a/tool.sh +++ b/tool.sh @@ -73,7 +73,6 @@ clear_images() { docker image prune --force && docker images ; } - remove_folder() { for dir in "$@"; do if [ -d "$dir" ]; then