hazza/docker-stacks
1
0
Fork 0
mirror of https://github.com/jupyter/docker-stacks.git synced 2025-10-18 07:22:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't use matrix.image-variant, use 2 separate variables (#2217)

Browse Source
This commit is contained in:
Ayaz Salikhov
2025-02-17 21:52:47 +00:00
committed by GitHub
parent 3fc8373f13
commit 94246a3a32
1 changed files with 71 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
.github/workflows/docker.yml vendored
View File

@@ -311,27 +311,28 @@ jobs:
uses: ./.github/workflows/docker-tag-push.yml uses: ./.github/workflows/docker-tag-push.yml
with: with:
platform: aarch64 platform: aarch64
image: ${{ matrix.image-variant.image }} image: ${{ matrix.image }}
variant: ${{ matrix.image-variant.variant }} variant: ${{ matrix.variant }}
secrets: secrets:
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }} REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }} REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
strategy: strategy:
matrix: matrix:
image-variant: image:
[ [
{ image: docker-stacks-foundation, variant: default }, docker-stacks-foundation,
{ image: base-notebook, variant: default }, base-notebook,
{ image: minimal-notebook, variant: default }, minimal-notebook,
{ image: scipy-notebook, variant: default }, scipy-notebook,
{ image: r-notebook, variant: default }, r-notebook,
{ image: julia-notebook, variant: default }, julia-notebook,
{ image: tensorflow-notebook, variant: default }, tensorflow-notebook,
{ image: pytorch-notebook, variant: default }, pytorch-notebook,
{ image: datascience-notebook, variant: default }, datascience-notebook,
{ image: pyspark-notebook, variant: default }, pyspark-notebook,
{ image: all-spark-notebook, variant: default }, all-spark-notebook,
] ]
variant: [default]
needs: needs:
[ [
aarch64-foundation, aarch64-foundation,
@@ -352,18 +353,15 @@ jobs:
uses: ./.github/workflows/docker-tag-push.yml uses: ./.github/workflows/docker-tag-push.yml
with: with:
platform: aarch64 platform: aarch64
image: ${{ matrix.image-variant.image }} image: ${{ matrix.image }}
variant: ${{ matrix.image-variant.variant }} variant: ${{ matrix.variant }}
secrets: secrets:
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }} REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }} REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
strategy: strategy:
matrix: matrix:
image-variant: image: [docker-stacks-foundation, base-notebook]
[ variant: [default]
{ image: docker-stacks-foundation, variant: default },
{ image: base-notebook, variant: default },
]
needs: [aarch64-foundation, aarch64-base] needs: [aarch64-foundation, aarch64-base]
if: contains(github.event.pull_request.title, '[FAST_BUILD]') if: contains(github.event.pull_request.title, '[FAST_BUILD]')
@@ -371,30 +369,35 @@ jobs:
uses: ./.github/workflows/docker-tag-push.yml uses: ./.github/workflows/docker-tag-push.yml
with: with:
platform: x86_64 platform: x86_64
image: ${{ matrix.image-variant.image }} image: ${{ matrix.image }}
variant: ${{ matrix.image-variant.variant }} variant: ${{ matrix.variant }}
secrets: secrets:
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }} REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }} REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
strategy: strategy:
matrix: matrix:
image-variant: image:
[ [
{ image: docker-stacks-foundation, variant: default }, docker-stacks-foundation,
{ image: base-notebook, variant: default }, base-notebook,
{ image: minimal-notebook, variant: default }, minimal-notebook,
{ image: scipy-notebook, variant: default }, scipy-notebook,
{ image: r-notebook, variant: default }, r-notebook,
{ image: julia-notebook, variant: default }, julia-notebook,
{ image: tensorflow-notebook, variant: default }, tensorflow-notebook,
{ image: tensorflow-notebook, variant: cuda }, pytorch-notebook,
{ image: pytorch-notebook, variant: default }, datascience-notebook,
{ image: pytorch-notebook, variant: cuda11 }, pyspark-notebook,
{ image: pytorch-notebook, variant: cuda12 }, all-spark-notebook,
{ image: datascience-notebook, variant: default },
{ image: pyspark-notebook, variant: default },
{ image: all-spark-notebook, variant: default },
] ]
variant: [default]
include:
- image: tensorflow-notebook
variant: cuda
- image: pytorch-notebook
variant: cuda11
- image: pytorch-notebook
variant: cuda12
needs: needs:
[ [
x86_64-foundation, x86_64-foundation,
@@ -415,66 +418,65 @@ jobs:
uses: ./.github/workflows/docker-tag-push.yml uses: ./.github/workflows/docker-tag-push.yml
with: with:
platform: x86_64 platform: x86_64
image: ${{ matrix.image-variant.image }} image: ${{ matrix.image }}
variant: ${{ matrix.image-variant.variant }} variant: ${{ matrix.variant }}
secrets: secrets:
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }} REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }} REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
strategy: strategy:
matrix: matrix:
image-variant: image: [docker-stacks-foundation, base-notebook]
[ variant: [default]
{ image: docker-stacks-foundation, variant: default },
{ image: base-notebook, variant: default },
]
needs: [x86_64-foundation, x86_64-base] needs: [x86_64-foundation, x86_64-base]
if: contains(github.event.pull_request.title, '[FAST_BUILD]') if: contains(github.event.pull_request.title, '[FAST_BUILD]')
merge-tags: merge-tags:
uses: ./.github/workflows/docker-merge-tags.yml uses: ./.github/workflows/docker-merge-tags.yml
with: with:
image: ${{ matrix.image-variant.image }} image: ${{ matrix.image }}
variant: ${{ matrix.image-variant.variant }} variant: ${{ matrix.variant }}
secrets: secrets:
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }} REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }} REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
strategy: strategy:
matrix: matrix:
image-variant: image:
[ [
{ image: docker-stacks-foundation, variant: default }, docker-stacks-foundation,
{ image: base-notebook, variant: default }, base-notebook,
{ image: minimal-notebook, variant: default }, minimal-notebook,
{ image: scipy-notebook, variant: default }, scipy-notebook,
{ image: r-notebook, variant: default }, r-notebook,
{ image: julia-notebook, variant: default }, julia-notebook,
{ image: tensorflow-notebook, variant: default }, tensorflow-notebook,
{ image: tensorflow-notebook, variant: cuda }, pytorch-notebook,
{ image: pytorch-notebook, variant: default }, datascience-notebook,
{ image: pytorch-notebook, variant: cuda11 }, pyspark-notebook,
{ image: pytorch-notebook, variant: cuda12 }, all-spark-notebook,
{ image: datascience-notebook, variant: default },
{ image: pyspark-notebook, variant: default },
{ image: all-spark-notebook, variant: default },
] ]
variant: [default]
include:
- image: tensorflow-notebook
variant: cuda
- image: pytorch-notebook
variant: cuda11
- image: pytorch-notebook
variant: cuda12
needs: [aarch64-images-tag-push, x86_64-images-tag-push] needs: [aarch64-images-tag-push, x86_64-images-tag-push]
if: (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && !contains(github.event.pull_request.title, '[FAST_BUILD]') if: (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && !contains(github.event.pull_request.title, '[FAST_BUILD]')
merge-tags-fast: merge-tags-fast:
uses: ./.github/workflows/docker-merge-tags.yml uses: ./.github/workflows/docker-merge-tags.yml
with: with:
image: ${{ matrix.image-variant.image }} image: ${{ matrix.image }}
variant: ${{ matrix.image-variant.variant }} variant: ${{ matrix.variant }}
secrets: secrets:
REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }} REGISTRY_USERNAME: ${{ secrets.QUAY_USERNAME }}
REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }} REGISTRY_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}
strategy: strategy:
matrix: matrix:
image-variant: image: [docker-stacks-foundation, base-notebook]
[ variant: [default]
{ image: docker-stacks-foundation, variant: default },
{ image: base-notebook, variant: default },
]
needs: [aarch64-images-tag-push-fast, x86_64-images-tag-push-fast] needs: [aarch64-images-tag-push-fast, x86_64-images-tag-push-fast]
if: (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && contains(github.event.pull_request.title, '[FAST_BUILD]') if: (github.repository_owner == 'jupyter' || github.repository_owner == 'mathbunnyru') && contains(github.event.pull_request.title, '[FAST_BUILD]')