From 77d8c17c3116b3d88d97ba9447d1be5f302dc82e Mon Sep 17 00:00:00 2001
From: Peter Havekes <peter@havekes.eu>
Date: Thu, 28 May 2026 09:10:57 +0200
Subject: [PATCH 1/3] Add entrypoint to clear the federation metadata cache on
 startup

---
 docker/Dockerfile.prod |  3 +++
 docker/Dockerfile.test |  3 +++
 docker/entrypoint.sh   | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+)
 create mode 100644 docker/entrypoint.sh

diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
index c5788834..1b13165e 100644
--- a/docker/Dockerfile.prod
+++ b/docker/Dockerfile.prod
@@ -14,6 +14,8 @@ RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \
 COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml
 COPY config/openconext/institutions.yaml.dist config/openconext/institutions.yaml
 
+COPY ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+
 # Add the config files for Apache2
 RUN rm -rf /etc/apache2/sites-enabled/*
 COPY ./docker/conf/azuremfa-apache2.conf /etc/apache2/sites-enabled/azuremfa.conf
@@ -23,4 +25,5 @@ EXPOSE 80
 # Set the default workdir
 WORKDIR /var/www/html
 
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test
index fe7552d7..aaf0100b 100644
--- a/docker/Dockerfile.test
+++ b/docker/Dockerfile.test
@@ -13,10 +13,13 @@ COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml
 COPY config/openconext/institutions.yaml.dist config/openconext/institutions.yaml
 COPY config/packages/prod/monolog.yaml.docker config/packages/prod/monolog.yaml
 
+COPY ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+
 # Add the config files for Apache2
 RUN rm -rf /etc/apache2/sites-enabled/* && rm -rf /var/www/html/output.zip
 COPY ./docker/conf/azuremfa-apache2.conf /etc/apache2/sites-enabled/azuremfa.conf
 RUN rm -rf /var/www/html/var/cache/prod && chown -R www-data /var/www/html/var
 EXPOSE 80
 
+ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
 CMD ["apache2-foreground"]
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
new file mode 100644
index 00000000..e5c2dc27
--- /dev/null
+++ b/docker/entrypoint.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+PARAM_FILE="/var/www/html/config/openconext/parameters.yaml"
+CACHE_DIR=$(grep -E '^ *federation_metadata_cache_location:' "$PARAM_FILE" \
+           | cut -d ':' -f2- | tr -d '[:space:]')
+
+if [ -z "$CACHE_DIR" ]; then
+    CACHE_DIR="/var/www/html/federation-metadata"
+fi
+
+echo "Metadata cache‑map: $CACHE_DIR"
+
+if [ -d "$CACHE_DIR" ]; then
+    echo "Leegmaken van Metadata cache‑map $CACHE_DIR"
+    rm -rf "$CACHE_DIR"/* 2>/dev/null
+fi
+
+exec "$@"
\ No newline at end of file

From 90e3cc92ac9cc250b915491023a092d0a9982632 Mon Sep 17 00:00:00 2001
From: Peter Havekes <peter.havekes@surf.nl>
Date: Thu, 18 Jun 2026 16:23:53 +0200
Subject: [PATCH 2/3] Update docker/Dockerfile.prod

Co-authored-by: Johan Kromhout <60608181+johanib@users.noreply.github.com>
---
 docker/Dockerfile.prod | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile.prod b/docker/Dockerfile.prod
index 1b13165e..e79bbdb2 100644
--- a/docker/Dockerfile.prod
+++ b/docker/Dockerfile.prod
@@ -14,7 +14,7 @@ RUN tar -xvjf /tmp/*.tar.bz2 -C /var/www/html/ && \
 COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml
 COPY config/openconext/institutions.yaml.dist config/openconext/institutions.yaml
 
-COPY ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY --chmod=755 ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh
 
 # Add the config files for Apache2
 RUN rm -rf /etc/apache2/sites-enabled/*

From cbcfb8364fe00ba9f3db7ef228fabe26edd0159e Mon Sep 17 00:00:00 2001
From: Johan Kromhout <60608181+johanib@users.noreply.github.com>
Date: Thu, 18 Jun 2026 16:36:36 +0200
Subject: [PATCH 3/3] Update docker/Dockerfile.test

---
 docker/Dockerfile.test | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test
index aaf0100b..da19bd82 100644
--- a/docker/Dockerfile.test
+++ b/docker/Dockerfile.test
@@ -13,7 +13,7 @@ COPY config/openconext/parameters.yaml.dist config/openconext/parameters.yaml
 COPY config/openconext/institutions.yaml.dist config/openconext/institutions.yaml
 COPY config/packages/prod/monolog.yaml.docker config/packages/prod/monolog.yaml
 
-COPY ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY --chmod=755 ./docker/entrypoint.sh /usr/local/bin/entrypoint.sh
 
 # Add the config files for Apache2
 RUN rm -rf /etc/apache2/sites-enabled/* && rm -rf /var/www/html/output.zip