ci: use bake in continuos-deliver.yml

Signed-off-by: Niccolò Fei <[email protected]>

Author: NiccoloFei

.github/workflows/continuous-delivery.yml

@@ -14,10 +14,6 @@ on:
   schedule:
   - cron:  '0 1 * * *'
 
-# set up environment variables to be used across all the jobs
-env:
-  REGISTRY: "ghcr.io/${{ github.repository_owner }}/postgresql-trunk"
-
 defaults:
   run:
     # default failure handling for shell scripts in 'run' steps
@@ -31,7 +27,7 @@ jobs:
       contents: read
       packages: write
     outputs:
-      pg_image: ${{ env.TAG }}
+      pg_image: ${{ env.PG_IMAGE }}
       pg_major: ${{ env.PG_MAJOR }}
       cnpg_branch: ${{ env.CNPG_BRANCH }}
       test_depth: ${{ env.TEST_DEPTH }}
@@ -59,26 +55,32 @@ jobs:
           echo "FEATURE_TYPE=${{ github.event.inputs.feature_type }}" >> $GITHUB_ENV
         fi
 
-    - name: Set tag
-      run: |
-        postgres_img="${{ env.REGISTRY }}:${{ env.PG_MAJOR }}-devel"
-        echo "TAG=${postgres_img}" >> $GITHUB_ENV
-
     - name: Log in to the GitHub Container registry
       uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
         password: ${{ secrets.GITHUB_TOKEN }}
 
-    - name: Build and load
-      uses: docker/build-push-action@v6
+    - name: Set up Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Build and push
+      uses: docker/bake-action@v6
+      id: build
+      env:
+        environment: production
+        registry: ghcr.io/${{ github.repository_owner }}
+        revision: ${{ github.sha }}
+        pgMajor: ${{ env.PG_MAJOR }}
       with:
-        context: .
         push: true
-        load: false
-        tags: |
-          ${{ env.TAG }}
+
+    # Get a list of the images that were built and pushed. We only care about a single tag for each image.
+    - name: Generated images
+      id: images
+      run: |
+        echo "PG_IMAGE=$(echo '${{ steps.build.outputs.metadata }}' | jq -c '.["standard"].["image.name"]' | grep -oP '[^,]*\d{12}[^,]*')" >> $GITHUB_ENV
 
   call-reusable-e2e:
     if: github.event_name == 'schedule'

defaults.json

@@ -1,5 +1,5 @@
 {
-  "PG_IMAGE": "ghcr.io/cloudnative-pg/postgresql-trunk:18-devel",
+  "PG_IMAGE": "ghcr.io/cloudnative-pg/postgresql-trunk:18-standard-bookworm",
   "PG_MAJOR": 18,
   "CNPG_BRANCH": "main",
   "TEST_DEPTH": 4,

docker-bake.hcl

@@ -19,6 +19,10 @@ variable "revision" {
   default = "1"
 }
 
+variable "pgMajor" {
+  default = "18"
+}
+
 fullname = ( environment == "testing") ? "${registry}/postgresql-trunk-testing" : "${registry}/postgresql-trunk"
 now = timestamp()
 title = "PostgreSQL Trunk Containers"
@@ -33,7 +37,7 @@ target "default" {
       "standard",
       "postgis"
     ]
-    pgMajor = ["18"]
+    pgMajor = ["${pgMajor}"]
     base = ["debian:bookworm-slim"]
   }
 
@@ -42,7 +46,7 @@ target "default" {
   ]
 
   dockerfile = "Dockerfile"
-  name = "postgresql-${pgMajor}-${tgt}-${distroVersion(base)}"
+  name = "${tgt}"
   tags = [
     "${fullname}:${pgMajor}-${tgt}-${distroVersion(base)}",
     "${fullname}:${pgMajor}-${formatdate("YYYYMMDDhhmm", now)}-${tgt}-${distroVersion(base)}"