another one

StatCan · Aug 23, 2023 · 18116b6 · 18116b6
1 parent d719e6a
commit 18116b6
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/.github/workflows/build_push.yaml b/.github/workflows/build_push.yaml
@@ -146,6 +146,23 @@ jobs:
     - name: Push image to local registry (default pushes all tags)
       run: make push/${{ matrix.notebook }} REPO=${{ env.LOCAL_REPO }}
 
+    # Run Dockle
+    - name: Run dockle
+      run : |
+        echo "DKL-DI-0006" > .dockleignore
+        curl -L -o dockle.deb https://github.com/goodwithtech/dockle/releases/download/v${{ env.DOCKLE_VERSION }}/dockle_${{ env.DOCKLE_VERSION }}_Linux-64bit.deb && sudo dpkg -i dockle.deb && rm dockle.deb
+        echo localhost:5000/${{ matrix.notebook }}:${{ github.sha }}
+        echo ${{ steps.build-image.outputs.full_image_name }}
+        dockle --exit-code 0 --exit-level fatal localhost:5000/${{ matrix.notebook }}:${{ github.sha }}
+    #  uses: goodwithtech/dockle-action@main
+    #  with:
+    #    image: ${{ steps.build-image.outputs.full_image_name }}
+    #    #image: localhost:5000/${{ matrix.notebook }}:${{ github.sha }}
+    #    format: 'list'
+    #    exit-code: '0'
+    #   exit-level: 'fatal'
+    #    ignore: 'DKL-DI-0006'  
+
     # Image testing
 
     - name: Set Up Python for Test Suite
@@ -172,23 +189,6 @@ jobs:
         curl -sfL https://raw.githubusercontent.com/aquasecurity/trivy/main/contrib/install.sh | sh -s -- -b /usr/local/bin ${{ env.TRIVY_VERSION }}
         trivy image ${{ steps.build-image.outputs.full_image_name }} --exit-code 1 --timeout=20m --security-checks vuln --severity CRITICAL 
     
-    # Run Dockle
-    - name: Run dockle
-      run : |
-        echo "DKL-DI-0006" > .dockleignore
-        curl -L -o dockle.deb https://github.com/goodwithtech/dockle/releases/download/v${{ env.DOCKLE_VERSION }}/dockle_${{ env.DOCKLE_VERSION }}_Linux-64bit.deb && sudo dpkg -i dockle.deb && rm dockle.deb
-        echo localhost:5000/${{ matrix.notebook }}:${{ github.sha }}
-        echo ${{ steps.build-image.outputs.full_image_name }}
-        dockle --exit-code 0 --exit-level fatal localhost:5000/${{ matrix.notebook }}:${{ github.sha }}
-    #  uses: goodwithtech/dockle-action@main
-    #  with:
-    #    image: ${{ steps.build-image.outputs.full_image_name }}
-    #    #image: localhost:5000/${{ matrix.notebook }}:${{ github.sha }}
-    #    format: 'list'
-    #    exit-code: '0'
-    #   exit-level: 'fatal'
-    #    ignore: 'DKL-DI-0006'  
-
     # Push image to ACR
     # Pushes if this is a push to master or an update to a PR that has auto-deploy label
     - name: Test if we should push to ACR