build verbeteren

Author: dennismdejong

.github/workflows/docker-build.yml

@@ -11,20 +11,14 @@ env:
   REGISTRY: ghcr.io
 
 jobs:
-  build-and-push:
+  build-base-sql:
     runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
 
-    strategy:
-      fail-fast: false # Zorgt dat als één image faalt, de andere wel doorgaat
-      matrix:
-        include:
-          - image_name: custom-jupyter-sql
-            dockerfile: ./docker/Dockerfile.base-sql
-          - image_name: custom-jupyter-ai
-            dockerfile: ./docker/Dockerfile.ai-ext
+    outputs:
+      base_tag: ${{ steps.meta.outputs.version }}
 
     steps:
       - name: Checkout repository
@@ -44,7 +38,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ matrix.image_name }}
+          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/custom-jupyter-sql
           tags: |
             type=semver,pattern={{version}}
             type=semver,pattern={{major}}.{{minor}}
@@ -54,10 +48,55 @@ jobs:
         uses: docker/build-push-action@v5
         with:
           context: .
-          file: ${{ matrix.dockerfile }}
+          file: ./docker/Dockerfile.base-sql
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           platforms: linux/amd64
           cache-from: type=gha
-          cache-to: type=gha,mode=max
+          cache-to: type=gha,mode=max
+
+  build-ai-ext:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    needs: build-base-sql
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/custom-jupyter-ai
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=raw,value=latest,enable=${{ github.ref == 'refs/heads/main' }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ./docker/Dockerfile.ai-ext
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          platforms: linux/amd64
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+          build-args: |
+            BASE_TAG=${{ needs.build-base-sql.outputs.base_tag }}

docker/Dockerfile.ai-ext

@@ -1,5 +1,6 @@
-# We gebruiken het image dat we zojuist gebouwd hebben als bron
-FROM ghcr.io/dennismdejong/custom-jupyter-sql:1.0.4
+# Base image tag wordt doorgegeven via build argument
+ARG BASE_TAG=latest
+FROM ghcr.io/dennismdejong/custom-jupyter-sql:${BASE_TAG}
 
 USER ${NB_UID}