Workflow updates.

Author: vladd-bit

.github/workflows/docker-jupyter-hub.yml

@@ -1,24 +1,18 @@
 name: docker-jupyter-hub-hybrid-architecture
 
 on:
-
   push:
     branches: ['**']
     tags: ['v*.*.*']
   pull_request:
     branches: ['**']
   release:
     types: [published]
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
-
   build:
-
     runs-on: ${{ matrix.runner }}
-
     strategy:
       matrix:
         platform: [amd64, arm64]
@@ -27,52 +21,43 @@ jobs:
             runner: ubuntu-22.04
           - platform: arm64
             runner: ubuntu-22.04-arm
-  
-    env:
-      working-directory: ./
 
-    # Steps represent a sequence of tasks that will be executed as part of the job
     steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
-        
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
-        
-      - name: checkout repo
-        uses: actions/checkout@v3
-        
+
       - name: Log in to Docker Hub
         if: ${{ github.actor != 'dependabot[bot]' }}
         uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-          
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: cogstacksystems/jupyter-hub:latest
-          
-      - name: Get and set release version env var
-        id: release_version
-        run: |
-             echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
-             echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_OUTPUT
-
-      - name: set docker release tag name
-        id: set_release_version_latest
-        if: ${{ github.ref == 'refs/heads/main' }}
-        run: echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
-      
-      - name: set CPU architecture
-        id: set_cpu_architecture
-        run: echo "CPU_ARCHITECTURE=${{ matrix.platform }}" >> $GITHUB_ENV
 
-      - name: Build and push Docker Jupyter Hub image
+      - name: Compute release tag
+        id: release_version
         run: |
-          docker build --platform linux/${{ matrix.platform }} -t cogstacksystems/jupyter-hub:$RELEASE_VERSION-${{ matrix.platform }} -f Dockerfile_hub --build-arg CPU_ARCHITECTURE=${{ matrix.platform }} .
-          docker push cogstacksystems/jupyter-hub:$RELEASE_VERSION-${{ matrix.platform }}
-          DIGEST=$(docker images --digests --format '{{.Digest}}' cogstacksystems/jupyter-hub | head -n 1)
-          echo "digest=$DIGEST" >> $GITHUB_OUTPUT
+          if [[ "${GITHUB_REF#refs/heads/}" == "${GITHUB_REF}" ]]; then
+            VERSION="${GITHUB_REF#refs/*/}"
+          else
+            VERSION="latest"
+          fi
+          echo "RELEASE_VERSION=$VERSION" >> "$GITHUB_ENV"
+          echo "release_version=$VERSION" >> "$GITHUB_OUTPUT"
+
+      - name: Build and push Jupyter Hub image
+        uses: docker/build-push-action@v6
+        with:
+          context: ./
+          platforms: linux/${{ matrix.platform }}
+          file: Dockerfile_hub
+          build-args: |
+            CPU_ARCHITECTURE=${{ matrix.platform }}
+          tags: |
+            cogstacksystems/jupyter-hub:${{ steps.release_version.outputs.release_version }}-${{ matrix.platform }}
+          push: ${{ github.actor != 'dependabot[bot]' }}

.github/workflows/docker-jupyter-singleuser.yml

@@ -1,16 +1,13 @@
 name: docker-jupyter-singleuser-cpu-gpu-hybrid-architecture
 
 on:
-
   push:
     branches: ['**']
     tags: ['v*.*.*']
   pull_request:
     branches: ['**']
   release:
     types: [published]
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
@@ -23,44 +20,28 @@ jobs:
         uses: actions/checkout@v3
         with:
           submodules: true
+
       - name: Git Submodule Update
         run: |
-          git submodule update --init --recursive
-          git pull --recurse-submodules origin main
-          git submodule update --remote --recursive
-
-      - name: Log in to Docker Hub
-        if: ${{ github.actor != 'dependabot[bot]' }}
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+          git submodule update --init --remote --recursive
 
       - name: Metadata for Docker
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: |
-            cogstacksystems/jupyter-singleuser:latest
+          images: cogstacksystems/jupyter-singleuser:latest
+
       - name: Get and Set Release Version
         id: release_version
         run: |
           if [[ "${GITHUB_REF#refs/heads/}" == "${GITHUB_REF}" ]]; then
-            # it's a tag or something else
             VERSION="${GITHUB_REF#refs/*/}"
           else
             VERSION="latest"
           fi
           echo "RELEASE_VERSION=$VERSION" >> $GITHUB_ENV
           echo "release_version=$VERSION" >> $GITHUB_OUTPUT
 
-      - name: Tag Setup
-        run: |
-          if [[ "${RELEASE_VERSION}" == "main" ]]; then
-            echo "RELEASE_VERSION=latest" >> $GITHUB_ENV
-          else
-            echo "RELEASE_VERSION=${RELEASE_VERSION#?}" >> $GITHUB_ENV
-          fi
   build-cpu:
     needs: setup
     runs-on: ubuntu-22.04
@@ -70,8 +51,17 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+
+      - name: Log in to Docker Hub
+        if: ${{ github.actor != 'dependabot[bot]' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
+
       - name: Build and Push CPU Image
         uses: docker/build-push-action@v6
         with:
@@ -80,20 +70,32 @@ jobs:
           build-args: |
             CPU_ARCHITECTURE=${{ matrix.platform }}
           tags: cogstacksystems/jupyter-singleuser:${{ needs.setup.outputs.release_version }}-${{ matrix.platform }}
-          push: true
+          push: ${{ github.actor != 'dependabot[bot]' }}
 
   build-gpu:
     needs: setup
     runs-on: ubuntu-22.04
     steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Log in to Docker Hub
+        if: ${{ github.actor != 'dependabot[bot]' }}
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
       - name: Build and Push GPU Image
         uses: docker/build-push-action@v6
         with:
-          context: ${{ env.CONTEXT }}
+          context: ./
           platforms: linux/amd64
           file: Dockerfile_singleuser_gpu
           build-args: |
             CPU_ARCHITECTURE=amd64
-          tags: |
-            cogstacksystems/jupyter-singleuser-gpu:${{ needs.setup.outputs.release_version }}-amd64
-          push: true
+          tags: cogstacksystems/jupyter-singleuser-gpu:${{ needs.setup.outputs.release_version }}-amd64
+          push: ${{ github.actor != 'dependabot[bot]' }}