Skip to content

Add entrypoint to clear the federation metadata cache on startup #244

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
phavekes wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add entrypoint to clear the federation metadata cache on startup #244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions docker/Dockerfile.prod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -23,4 +25,5 @@ EXPOSE 80
# Set the default workdir
WORKDIR /var/www/html

ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]
CMD ["apache2-foreground"]
3 changes: 3 additions & 0 deletions docker/Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
18 changes: 18 additions & 0 deletions docker/entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 "$@"
Loading