Use builder image from registry

bounverif · Feb 1, 2025 · 8cf5c95 · 8cf5c95
1 parent d868eac
commit 8cf5c95
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/buildah-build-builder.yml b/.github/workflows/buildah-build-builder.yml
@@ -12,12 +12,12 @@ on:
         description: ESMINI_VERSION
         type: string
         required: true
-        default: v2.45.1
+        default: latest
 
 env:
   REGISTRY: ghcr.io/bounverif
   IMAGE_NAME: esmini
-  ESMINI_VERSION: v2.45.1
+  ESMINI_VERSION: latest
   # CONTAINERS_ROOT: /home/runner/.local/share/containers
   # TMPDIR: /home/runner/.local/share/containers/tmp
 
@@ -53,12 +53,15 @@ jobs:
       #     build-mount-path: ${{ env.CONTAINERS_ROOT }} # The remaining space only for container build
       # - run: mkdir -p $TMPDIR
 
-      - name: Set platform tag
+      - name: Prepare environment variables
         run: |
           arch=$(podman info --format='{{.Host.Arch}}')
           platform=$(podman info --format='{{.Version.OsArch}}' | sed 's/\//-/g')
           echo "PODMAN_ARCH=${arch}" >> $GITHUB_ENV
           echo "PLATFORM=${platform}" >> $GITHUB_ENV
+          if [ "${{ env.ESMINI_VERSION }}" == "latest" ]; then
+            echo "ESMINI_VERSION=$(curl -sL "https://api.github.com/repos/esmini/esmini/releases/latest" | jq -r '.tag_name')" >> $GITHUB_ENV
+          fi
 
       - name: Checkout repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/buildah-build-runtime.yml b/.github/workflows/buildah-build-runtime.yml
@@ -47,12 +47,15 @@ jobs:
       #     build-mount-path: ${{ env.CONTAINERS_ROOT }} # The remaining space only for container build
       # - run: mkdir -p $TMPDIR
 
-      - name: Set platform tag
+      - name: Prepare environment variables
         run: |
           arch=$(podman info --format='{{.Host.Arch}}')
           platform=$(podman info --format='{{.Version.OsArch}}' | sed 's/\//-/g')
           echo "PODMAN_ARCH=${arch}" >> $GITHUB_ENV
           echo "PLATFORM=${platform}" >> $GITHUB_ENV
+          if [ "${{ env.ESMINI_VERSION }}" == "latest" ]; then
+            echo "ESMINI_VERSION=$(curl -sL "https://api.github.com/repos/esmini/esmini/releases/latest" | jq -r '.tag_name')" >> $GITHUB_ENV
+          fi
 
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -74,6 +77,7 @@ jobs:
           layers: true
           oci: true
           build-args: |
+            ESMINI_IMAGE_NAME=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
             ESMINI_VERSION=${{ env.ESMINI_VERSION }}
           extra-args: |
             --target esmini-runtime