From 02e24c9d2dd0db3319bca81d0cdf7de113c03f0a Mon Sep 17 00:00:00 2001
From: Revant Nandgaonkar <revant.one@gmail.com>
Date: Sat, 15 Mar 2025 19:07:33 +0530
Subject: [PATCH] build: add pkg-config deb package in build layer (#1590)

* build: add pkg-config deb package in build layer

* ci: only use tonistiigi/binfmt for image push

* revert: arm64 builds

* ci: copy build_bench to docker-build-push

* ci: set driver-opts network=host for buildx action
---
 .github/workflows/docker-build-push.yml | 5 ++++-
 images/bench/Dockerfile                 | 1 +
 images/custom/Containerfile             | 1 +
 images/production/Containerfile         | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml
index fc189eff..ffccb67c 100644
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       registry:
-        image: registry:2
+        image: docker.io/registry:2
         ports:
           - 5000:5000
     strategy:
@@ -53,6 +53,9 @@ jobs:
 
       - name: Setup Buildx
         uses: docker/setup-buildx-action@v3
+        with:
+          driver-opts: network=host
+          platforms: linux/${{ matrix.arch }}
 
       - name: Get latest versions
         run: python3 ./.github/scripts/get_latest_tags.py --repo ${{ inputs.repo }} --version ${{ inputs.version }}
diff --git a/images/bench/Dockerfile b/images/bench/Dockerfile
index 8281e255..ba7641cf 100644
--- a/images/bench/Dockerfile
+++ b/images/bench/Dockerfile
@@ -47,6 +47,7 @@ RUN apt-get update \
     libsasl2-dev \
     libtiff5-dev \
     libwebp-dev \
+    pkg-config \
     redis-tools \
     rlwrap \
     tk8.6-dev \
diff --git a/images/custom/Containerfile b/images/custom/Containerfile
index a35b93fe..ff02845b 100644
--- a/images/custom/Containerfile
+++ b/images/custom/Containerfile
@@ -94,6 +94,7 @@ RUN apt-get update \
     libsasl2-dev \
     libtiff5-dev \
     libwebp-dev \
+    pkg-config \
     redis-tools \
     rlwrap \
     tk8.6-dev \
diff --git a/images/production/Containerfile b/images/production/Containerfile
index 78c80f73..7f36e0ed 100644
--- a/images/production/Containerfile
+++ b/images/production/Containerfile
@@ -86,6 +86,7 @@ RUN apt-get update \
     libsasl2-dev \
     libtiff5-dev \
     libwebp-dev \
+    pkg-config \
     redis-tools \
     rlwrap \
     tk8.6-dev \