diff --git a/.github/actions/download-manifests/action.yml b/.github/actions/download-manifests/action.yml index c96fcd70..f5251701 100644 --- a/.github/actions/download-manifests/action.yml +++ b/.github/actions/download-manifests/action.yml @@ -38,86 +38,6 @@ runs: with: name: base-notebook-x86_64-history_line path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: minimal-notebook-aarch64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: minimal-notebook-x86_64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: scipy-notebook-aarch64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: scipy-notebook-x86_64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: r-notebook-aarch64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: r-notebook-x86_64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: julia-notebook-aarch64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: julia-notebook-x86_64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: tensorflow-notebook-aarch64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: tensorflow-notebook-x86_64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: datascience-notebook-aarch64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: datascience-notebook-x86_64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: pyspark-notebook-aarch64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: pyspark-notebook-x86_64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: all-spark-notebook-aarch64-history_line - path: ${{ inputs.histLineDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: all-spark-notebook-x86_64-history_line - path: ${{ inputs.histLineDir }} - name: Download artifact 📥 uses: actions/download-artifact@v3 @@ -139,73 +59,3 @@ runs: with: name: base-notebook-x86_64-manifest path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: minimal-notebook-aarch64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: minimal-notebook-x86_64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: scipy-notebook-aarch64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: scipy-notebook-x86_64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: r-notebook-aarch64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: r-notebook-x86_64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: tensorflow-notebook-aarch64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: tensorflow-notebook-x86_64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: datascience-notebook-aarch64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: datascience-notebook-x86_64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: pyspark-notebook-aarch64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: pyspark-notebook-x86_64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: all-spark-notebook-aarch64-manifest - path: ${{ inputs.manifestDir }} - - name: Download artifact 📥 - uses: actions/download-artifact@v3 - with: - name: all-spark-notebook-x86_64-manifest - path: ${{ inputs.manifestDir }} diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 55fb9e20..7c083c08 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -89,157 +89,6 @@ jobs: runsOn: ubuntu-latest needs: [x86_64-foundation] - aarch64-minimal: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: base-notebook - image: minimal-notebook - platform: aarch64 - runsOn: ARM64 - needs: [aarch64-base] - if: github.repository == 'jupyter/docker-stacks' - - x86_64-minimal: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: base-notebook - image: minimal-notebook - platform: x86_64 - runsOn: ubuntu-latest - needs: [x86_64-base] - - aarch64-scipy: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: minimal-notebook - image: scipy-notebook - platform: aarch64 - runsOn: ARM64 - needs: [aarch64-minimal] - if: github.repository == 'jupyter/docker-stacks' - - x86_64-scipy: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: minimal-notebook - image: scipy-notebook - platform: x86_64 - runsOn: ubuntu-latest - needs: [x86_64-minimal] - - aarch64-r: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: minimal-notebook - image: r-notebook - platform: aarch64 - runsOn: ARM64 - needs: [aarch64-minimal] - if: github.repository == 'jupyter/docker-stacks' - - x86_64-r: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: minimal-notebook - image: r-notebook - platform: x86_64 - runsOn: ubuntu-latest - needs: [x86_64-minimal] - - aarch64-julia: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: minimal-notebook - image: julia-notebook - platform: aarch64 - runsOn: ARM64 - needs: [aarch64-minimal] - if: github.repository == 'jupyter/docker-stacks' - - x86_64-julia: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: minimal-notebook - image: julia-notebook - platform: x86_64 - runsOn: ubuntu-latest - needs: [x86_64-minimal] - - aarch64-tensorflow: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: scipy-notebook - image: tensorflow-notebook - platform: aarch64 - runsOn: ARM64 - needs: [aarch64-scipy] - - x86_64-tensorflow: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: scipy-notebook - image: tensorflow-notebook - platform: x86_64 - runsOn: ubuntu-latest - needs: [x86_64-scipy] - - aarch64-datascience: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: scipy-notebook - image: datascience-notebook - platform: aarch64 - runsOn: ARM64 - needs: [aarch64-scipy] - if: github.repository == 'jupyter/docker-stacks' - - x86_64-datascience: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: scipy-notebook - image: datascience-notebook - platform: x86_64 - runsOn: ubuntu-latest - needs: [x86_64-scipy] - - aarch64-pyspark: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: scipy-notebook - image: pyspark-notebook - platform: aarch64 - runsOn: ARM64 - needs: [aarch64-scipy] - if: github.repository == 'jupyter/docker-stacks' - - x86_64-pyspark: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: scipy-notebook - image: pyspark-notebook - platform: x86_64 - runsOn: ubuntu-latest - needs: [x86_64-scipy] - - aarch64-all-spark: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: pyspark-notebook - image: all-spark-notebook - platform: aarch64 - runsOn: ARM64 - needs: [aarch64-pyspark] - if: github.repository == 'jupyter/docker-stacks' - - x86_64-all-spark: - uses: ./.github/workflows/docker-build-test-upload.yml - with: - parentImage: pyspark-notebook - image: all-spark-notebook - platform: x86_64 - runsOn: ubuntu-latest - needs: [x86_64-pyspark] - aarch64-images-tag-push: uses: ./.github/workflows/docker-tag-push.yml with: @@ -250,32 +99,8 @@ jobs: DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} strategy: matrix: - image: - [ - docker-stacks-foundation, - base-notebook, - minimal-notebook, - scipy-notebook, - r-notebook, - julia-notebook, - tensorflow-notebook, - datascience-notebook, - pyspark-notebook, - all-spark-notebook, - ] - needs: - [ - aarch64-foundation, - aarch64-base, - aarch64-minimal, - aarch64-scipy, - aarch64-r, - aarch64-julia, - aarch64-tensorflow, - aarch64-datascience, - aarch64-pyspark, - aarch64-all-spark, - ] + image: [docker-stacks-foundation, base-notebook] + needs: [aarch64-foundation, aarch64-base] if: github.repository == 'jupyter/docker-stacks' x86_64-images-tag-push: @@ -288,32 +113,8 @@ jobs: DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} strategy: matrix: - image: - [ - docker-stacks-foundation, - base-notebook, - minimal-notebook, - scipy-notebook, - r-notebook, - julia-notebook, - tensorflow-notebook, - datascience-notebook, - pyspark-notebook, - all-spark-notebook, - ] - needs: - [ - x86_64-foundation, - x86_64-base, - x86_64-minimal, - x86_64-scipy, - x86_64-r, - x86_64-julia, - x86_64-tensorflow, - x86_64-datascience, - x86_64-pyspark, - x86_64-all-spark, - ] + image: [docker-stacks-foundation, base-notebook] + needs: [x86_64-foundation, x86_64-base] merge-tags: uses: ./.github/workflows/docker-merge-tags.yml @@ -324,19 +125,7 @@ jobs: DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} strategy: matrix: - image: - [ - docker-stacks-foundation, - base-notebook, - minimal-notebook, - scipy-notebook, - r-notebook, - julia-notebook, - tensorflow-notebook, - datascience-notebook, - pyspark-notebook, - all-spark-notebook, - ] + image: [docker-stacks-foundation, base-notebook] needs: [aarch64-images-tag-push, x86_64-images-tag-push] if: github.repository == 'jupyter/docker-stacks'