From fcf4a64fdde3d98c14de44c424db976f95218614 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 21 May 2026 15:27:18 +0200
Subject: [PATCH 1/4] No ARCH_-lines

---
 IDMETA | 2 --
 1 file changed, 2 deletions(-)

diff --git a/IDMETA b/IDMETA
index 3c2e56a..ed6ad10 100644
--- a/IDMETA
+++ b/IDMETA
@@ -1,6 +1,4 @@
 DEBIAN_DIST="bullseye bookworm trixie"
 UBUNTU_DIST="jammy noble resolute"
 CENTOS_DIST="centos9 centos10"
-ARCH_ubuntu_resolute="amd64 arm64"
-ARCH_debian_trixie="amd64 arm64"
 VERSION=1.22.4

From 27d51888a40075a504d70ef5ac755da132ab3244 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 21 May 2026 16:33:09 +0200
Subject: [PATCH 2/4] Dockerfile: use indexdata repo again

Because yaz and yazpp now has releases for both amd64 and arm64.
---
 Dockerfile | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5438dda..030de5e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,5 @@
 FROM debian:trixie-slim AS build
 
-ARG YAZ_VERSION=5.37.1
-ARG YAZPP_VERSION=1.9.1
-
 # Builds from the workspace root dir
 WORKDIR /app
 
@@ -15,21 +12,10 @@ RUN apt update && apt-get install -y \
   libboost-test-dev libboost-regex-dev \
   git
 
-RUN curl https://ftp.indexdata.com/pub/yaz/yaz-${YAZ_VERSION}.tar.gz -o yaz-${YAZ_VERSION}.tar.gz
-RUN tar zxf yaz-${YAZ_VERSION}.tar.gz
-WORKDIR /app/yaz-${YAZ_VERSION}
-RUN ./configure --disable-shared --enable-static
-RUN make -j4
-
-WORKDIR /app
-
-RUN curl https://ftp.indexdata.com/pub/yazpp/yazpp-${YAZPP_VERSION}.tar.gz -o yazpp-${YAZPP_VERSION}.tar.gz
-RUN tar zxf yazpp-${YAZPP_VERSION}.tar.gz
-WORKDIR /app/yazpp-${YAZPP_VERSION}
-RUN ./configure --disable-shared --enable-static
-RUN make -j4
-
-WORKDIR /app
+RUN curl -s https://ftp.indexdata.com/debian/indexdata.gpg -o /usr/share/keyrings/indexdata.gpg
+RUN echo 'deb [signed-by=/usr/share/keyrings/indexdata.gpg] https://ftp.indexdata.com/debian trixie main' > /etc/apt/sources.list.d/indexdata.list
+RUN apt update
+RUN apt-get install -y libyazpp7-dev
 
 COPY . metaproxy
 RUN cd metaproxy && ./buildconf.sh

From de185124556b3a03c0e970c5a2c8bfccf68467cf Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 21 May 2026 16:53:54 +0200
Subject: [PATCH 3/4] Fewer RUNs. apt-get (instead of apt)

---
 Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 030de5e..08d8935 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM debian:trixie-slim AS build
 # Builds from the workspace root dir
 WORKDIR /app
 
-RUN apt update && apt-get install -y \
+RUN apt-get update && apt-get install -y \
   apt-transport-https ca-certificates curl \
   autoconf automake libtool gcc g++ make \
   tclsh xsltproc docbook docbook-xml docbook-xsl librsvg2-bin \
@@ -12,15 +12,15 @@ RUN apt update && apt-get install -y \
   libboost-test-dev libboost-regex-dev \
   git
 
-RUN curl -s https://ftp.indexdata.com/debian/indexdata.gpg -o /usr/share/keyrings/indexdata.gpg
-RUN echo 'deb [signed-by=/usr/share/keyrings/indexdata.gpg] https://ftp.indexdata.com/debian trixie main' > /etc/apt/sources.list.d/indexdata.list
-RUN apt update
-RUN apt-get install -y libyazpp7-dev
+RUN curl -sfSL https://ftp.indexdata.com/debian/indexdata.gpg -o /usr/share/keyrings/indexdata.gpg && \
+    echo 'deb [signed-by=/usr/share/keyrings/indexdata.gpg] https://ftp.indexdata.com/debian trixie main' > /etc/apt/sources.list.d/indexdata.list && \
+    apt-get update && apt-get install -y libyazpp7-dev libyaz5-dev && \
+    rm -rf /var/lib/apt/lists/*
 
 COPY . metaproxy
-RUN cd metaproxy && ./buildconf.sh
-RUN cd metaproxy && ./configure --disable-shared --enable-static
-RUN cd metaproxy && make -j4
+RUN cd metaproxy && ./buildconf.sh && \
+    ./configure --disable-shared --enable-static && \
+    make -j4
 
 # Save list of shared lib deps
 RUN ldd metaproxy/src/metaproxy | tr -s '[:blank:]' '\n' | grep '^/' | \

From 91c8a6b83c7508ca3bd608c8aad0be3525d8a3ca Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Thu, 21 May 2026 17:14:02 +0200
Subject: [PATCH 4/4] Potential fix for pull request finding

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
---
 Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 08d8935..c9bec97 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,7 +10,8 @@ RUN apt-get update && apt-get install -y \
   pkg-config libxslt1-dev libgnutls28-dev libicu-dev \
   libboost-dev libboost-system-dev libboost-thread-dev \
   libboost-test-dev libboost-regex-dev \
-  git
+  git && \
+  rm -rf /var/lib/apt/lists/*
 
 RUN curl -sfSL https://ftp.indexdata.com/debian/indexdata.gpg -o /usr/share/keyrings/indexdata.gpg && \
     echo 'deb [signed-by=/usr/share/keyrings/indexdata.gpg] https://ftp.indexdata.com/debian trixie main' > /etc/apt/sources.list.d/indexdata.list && \