set image upload dir to docker-stacks on containers; test build of mo…

…re images
helxplatform · Jul 3, 2023 · b95e9e6 · b95e9e6
1 parent ee063b3
commit b95e9e6
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 18 deletions.
diff --git a/.github/workflows/docker-build-test-upload.yml b/.github/workflows/docker-build-test-upload.yml
@@ -162,15 +162,15 @@ jobs:
       - name: Push to Containers 🫙
         id: containers
         run: |
-          docker push --all-tags containers.renci.org/${{ env.OWNER }}/jupyter/${{ inputs.image }}
+          docker push --all-tags containers.renci.org/${{ env.OWNER }}/jupyter/docker-stacks/${{ inputs.image }}
         continue-on-error: true
 
       # Sometimes containers.recnci.org fails so we try again.
       - name: If Containers Failed 
         if: ${{ steps.containers.conclusion == 'failure' }}
         run: |
           echo "Last push failed retrying "
-          docker push --all-tags containers.renci.org/${{ env.OWNER }}/jupyter/${{ inputs.image }}
+          docker push --all-tags containers.renci.org/${{ env.OWNER }}/jupyter/docker-stacks/${{ inputs.image }}
           echo "Completed!"
         continue-on-error: true
 
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -73,23 +73,32 @@ jobs:
       CONTAINERHUB_TOKEN: ${{ secrets.CONTAINERHUB_TOKEN }}
     needs: [minimal]
 
-  # # 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]
+  r:
+    uses: ./.github/workflows/docker-build-test-upload.yml
+    with:
+      parentImage: minimal-notebook
+      image: r-notebook
+      runsOn: ubuntu-latest
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      CONTAINERHUB_USERNAME: ${{ secrets.CONTAINERHUB_USERNAME }}
+      CONTAINERHUB_TOKEN: ${{ secrets.CONTAINERHUB_TOKEN }}
+    needs: [x86_64-minimal]
 
-  # # 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]
+  tensorflow:
+    uses: ./.github/workflows/docker-build-test-upload.yml
+    with:
+      parentImage: scipy-notebook
+      image: tensorflow-notebook
+      platform: x86_64
+      runsOn: ubuntu-latest
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      CONTAINERHUB_USERNAME: ${{ secrets.CONTAINERHUB_USERNAME }}
+      CONTAINERHUB_TOKEN: ${{ secrets.CONTAINERHUB_TOKEN }}
+    needs: [x86_64-scipy]
 
   datascience:
     uses: ./.github/workflows/docker-build-test-upload.yml
@@ -110,9 +119,36 @@ jobs:
       parentImage: minimal-notebook
       image: julia-notebook
       runsOn: ubuntu-latest
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      CONTAINERHUB_USERNAME: ${{ secrets.CONTAINERHUB_USERNAME }}
+      CONTAINERHUB_TOKEN: ${{ secrets.CONTAINERHUB_TOKEN }}
     needs: [minimal]
+
+  pyspark:
+    uses: ./.github/workflows/docker-build-test-upload.yml
+    with:
+      parentImage: scipy-notebook
+      image: pyspark-notebook
+      runsOn: ubuntu-latest
+    secrets:
+      DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
+      DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+      CONTAINERHUB_USERNAME: ${{ secrets.CONTAINERHUB_USERNAME }}
+      CONTAINERHUB_TOKEN: ${{ secrets.CONTAINERHUB_TOKEN }}
+    needs: [scipy]
+
+  all-spark:
+    uses: ./.github/workflows/docker-build-test-upload.yml
+    with:
+      parentImage: pyspark-notebook
+      image: all-spark-notebook
+      runsOn: ubuntu-latest
     secrets:
       DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
       DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
       CONTAINERHUB_USERNAME: ${{ secrets.CONTAINERHUB_USERNAME }}
       CONTAINERHUB_TOKEN: ${{ secrets.CONTAINERHUB_TOKEN }}
+    needs: [pyspark]
+