Upgrade dask version to 2023.11.0

.github/workflows/dockercd-dev.yml

@@ -12,59 +12,25 @@ env:
   PROJECT: 'coffea-casa'
   GITHUB_ACTIONS: 'true'
   REGISTRY: 'hub.opensciencegrid.org'
-  CACHE_PATH: /tmp/.buildx-cache
 
 jobs:
-  dask-base:
+  matrix-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [cc-base-ubuntu, cc-analysis-ubuntu]
+        # Keep this line in sync with gh actions @ coffea-dask repo
+        # python: [3.8, 3.9, '3.10']
+        #exclude:
+        #  - image: cc7
+        #    python: 3.8           
+    name: ${{ matrix.image }}
     runs-on: ubuntu-latest
     steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-          driver-opts: network=host
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        id: cache
-        with:
-          path: ${{ env.CACHE_PATH }}
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - name: Login to Harbor Hub
-        if: success() && github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          registry: hub.opensciencegrid.org
-          username: ${{ secrets.HARBOR_USER }}
-          password: ${{ secrets.HARBOR_PASSWORD }}
-      - name: Build
-        uses: docker/[email protected]
-        with:
-          push: true
-          cache-from: |
-            type=local,src=${{ env.CACHE_PATH }}
-          cache-to: type=local,dest=${{ env.CACHE_PATH }}
-          builder: ${{ steps.buildx.outputs.name }}
-          context: docker/
-          file: docker/Dockerfile.cc-base-ubuntu
-          tags: |
-            ${{ env.REGISTRY }}/coffea-casa/cc-base-ubuntu:development
-          build-args: |
-            TAG=development
-            PROJECT=${{ env.PROJECT }} 
-            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
-            REGISTRY=${{ env.REGISTRY }}
-
-  dask-cc:
-    runs-on: ubuntu-latest
-    needs: [dask-base]
-    steps:
+      - name: Fetch current date (with timestamp)
+        id: date
+        run: |
+          echo "::set-output name=date::$(date +"%Y-%m-%d_%H-%M-%S")"
       - name: Check out code
         uses: actions/checkout@v2
       - name: Set up QEMU
@@ -75,177 +41,23 @@ jobs:
         with:
           version: latest
           driver-opts: network=host
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        id: cache
-        with:
-          path: ${{ env.CACHE_PATH }}
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
       - name: Login to Harbor Hub
         if: success() && github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: hub.opensciencegrid.org
           username: ${{ secrets.HARBOR_USER }}
           password: ${{ secrets.HARBOR_PASSWORD }}
-      - name: Build
+      - name: Build and push
         uses: docker/[email protected]
         with:
-          #push: ${{ github.event_name != 'pull_request' }}
-          push: true
-          cache-from: |
-            type=local,src=${{ env.CACHE_PATH }}
-          cache-to: type=local,dest=${{ env.CACHE_PATH }}
           context: docker/
-          file: docker/Dockerfile.cc-ubuntu
-          tags: |
-            ${{ env.REGISTRY }}/coffea-casa/cc-ubuntu:development
-          build-args: |
-            DEV=true
-            TAG=development
-            PROJECT=${{ env.PROJECT }} 
-            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
-            REGISTRY=${{ env.REGISTRY }}
-
-#  dask-skyhook:
-#    runs-on: ubuntu-latest
-#    needs: [dask-cc]
-#    steps:
-#      - name: Check out code
-#        uses: actions/checkout@v2
-#      - name: Set up QEMU
-#        uses: docker/setup-qemu-action@v2
-#      - name: Set up Docker Buildx
-#        id: buildx
-#        uses: docker/setup-buildx-action@v2
-#        with:
-#          version: latest
-#          driver-opts: network=host
-#      - name: Cache Docker layers
-#        uses: actions/cache@v2
-#        id: cache
-#        with:
-#          path: ${{ env.CACHE_PATH }}
-#          key: ${{ runner.os }}-buildx-${{ github.sha }}
-#          restore-keys: |
-#            ${{ runner.os }}-buildx-
-#      - name: Login to Harbor Hub
-#        if: success() && github.event_name != 'pull_request'
-#        uses: docker/login-action@v2
-#        with:
-#          registry: ${{ env.REGISTRY }}
-#          username: ${{ secrets.HARBOR_USER }}
-#          password: ${{ secrets.HARBOR_PASSWORD }}
-#      - name: Build
-#        uses: docker/docker/[email protected]
-#        with:
-#          push: ${{ github.event_name != 'pull_request' }}
-#          cache-from: |
-#            type=local,src=${{ env.CACHE_PATH }}
-#          cache-to: type=local,dest=${{ env.CACHE_PATH }}
-#          context: docker/
-#          file: docker/Dockerfile.cc-base-centos7
-#          tags: |
-#            ${{ env.REGISTRY }}/coffea-casa/cc-ubuntu-skyhook:development
-#          build-args: |
-#            TAG=development
-#            PROJECT=${{ env.PROJECT }} 
-#            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
-#            REGISTRY=${{ env.REGISTRY }}
-
-  dask-analysis:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          version: latest
-          driver-opts: network=host
-      - name: Cache Docker layers
-        uses: actions/cache@v2
-        id: cache
-        with:
-          path: ${{ env.CACHE_PATH }}
-          key: ${{ runner.os }}-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-buildx-
-      - name: Login to Harbor Hub
-        if: success() && github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ secrets.HARBOR_USER }}
-          password: ${{ secrets.HARBOR_PASSWORD }}
-      - name: Build
-        uses: docker/build-push-action@v2
-        with:
-          #push: ${{ github.event_name != 'pull_request' }}
-          push: true
-          #outputs: type=docker,dest=/tmp/cc-analysis-ubuntu.tar
-          cache-from: |
-            type=local,src=${{ env.CACHE_PATH }}
-          cache-to: type=local,dest=${{ env.CACHE_PATH }}
-          context: docker/
-          file: docker/Dockerfile.cc-analysis-ubuntu
-          tags: |
-            ${{ env.REGISTRY }}/coffea-casa/cc-analysis-ubuntu:development
-          build-args: |
+          file: docker/Dockerfile.${{ matrix.image }}
+          push: ${{  github.event_name == 'push' }}
+          platforms: linux/amd64
+          tags: ${{ env.REGISTRY }}/coffea-casa/${{ matrix.image }}:development
+          build-args: 
             DEV=true
             TAG=development 
             PROJECT=${{ env.PROJECT }} 
             GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
-            REGISTRY=${{ env.REGISTRY }}
-
-#  dask-analysis-skyhook:
-#    runs-on: ubuntu-latest
-#    needs: [dask-analysis]
-#    steps:
-#      - name: Check out code
-#        uses: actions/checkout@v2
-#      - name: Set up QEMU
-#        uses: docker/setup-qemu-action@v2
-#      - name: Set up Docker Buildx
-#        id: buildx
-#        uses: docker/setup-buildx-action@v2
-#        with:
-#          version: latest
-#          driver-opts: network=host
-#      - name: Cache Docker layers
-#        uses: actions/cache@v2
-#        id: cache
-#        with:
-#          path: ${{ env.CACHE_PATH }}
-#          key: ${{ runner.os }}-buildx-${{ github.sha }}
-#          restore-keys: |
-#            ${{ runner.os }}-buildx-
-#      - name: Login to Harbor Hub
-#        if: success() && github.event_name != 'pull_request'
-#        uses: docker/login-action@v2
-#        with:
-#          registry: ${{ env.REGISTRY }}
-#          username: ${{ secrets.HARBOR_USER }}
-#          password: ${{ secrets.HARBOR_PASSWORD }}
-#      - name: Build
-#        uses: docker/[email protected]
-#        with:
-#          #push: ${{ github.event_name != 'pull_request' }}
-#          push: true
-#          cache-from: |
-#            type=local,src=${{ env.CACHE_PATH }}
-#          cache-to: type=local,dest=${{ env.CACHE_PATH }}
-#          context: docker/
-#          file: docker/Dockerfile.cc-analysis-ubuntu-skyhook
-#          tags: |
-#            ${{ env.REGISTRY }}/coffea-casa/cc-analysis-ubuntu-skyhook:development
-#          build-args: |
-#            TAG=development
-#            PROJECT=${{ env.PROJECT }} 
-#            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
-#            REGISTRY=${{ env.REGISTRY }}

.github/workflows/dockercd-tag.yml → .github/workflows/dockercd-tag.yml_

@@ -270,3 +270,70 @@ jobs:
 #            PROJECT=${{ env.PROJECT }} 
 #            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}
 #            REGISTRY=${{ env.REGISTRY }}
+
+
+name: Test docker images
+
+on:
+  pull_request:
+    paths:
+      - docker/**
+    branches:
+      - master
+  workflow_dispatch:
+
+env:
+  PROJECT: 'coffea-casa'
+  GITHUB_ACTIONS: 'true'
+  #REGISTRY: 'localhost:5000'
+  #REGISTRY_PATH: ${{ github.workspace }}/registry
+  #CACHE_PATH: /tmp/.buildx-cache
+
+jobs:
+  matrix-build:
+    strategy:
+      fail-fast: false
+      matrix:
+        image: [cc-base-ubuntu, cc-analysis-ubuntu]
+        # Keep this line in sync with gh actions @ coffea-dask repo
+        # python: [3.8, 3.9, '3.10']
+        #exclude:
+        #  - image: cc7
+        #    python: 3.8           
+    name: ${{ matrix.image }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Fetch current date (with timestamp)
+        id: date
+        run: |
+          echo "::set-output name=date::$(date +"%Y-%m-%d_%H-%M-%S")"
+      - name: Check out code
+        uses: actions/checkout@v2
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v2
+        with:
+          version: latest
+          driver-opts: network=host
+      - name: Login to Harbor Hub
+        if: success() && github.event_name != 'pull_request'
+        uses: docker/login-action@v2
+        with:
+          registry: hub.opensciencegrid.org
+          username: ${{ secrets.HARBOR_USER }}
+          password: ${{ secrets.HARBOR_PASSWORD }}
+      - name: Build and push
+        uses: docker/[email protected]
+        with:
+          context: docker/
+          file: docker/Dockerfile.${{ matrix.image }}
+          push: ${{  github.event_name == 'push' }}
+          platforms: linux/amd64
+          tags: coffea-casa/${{ matrix.image }}:development
+          build-args: 
+            DEV=true
+            TAG=development 
+            PROJECT=${{ env.PROJECT }} 
+            GITHUB_ACTIONS=${{ env.GITHUB_ACTIONS }}