Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions apache2-shibboleth/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,11 @@ EXPOSE 80
# Start Shibboleth and Apache
ENTRYPOINT ["/entrypoint.sh"]
CMD ["/usr/local/bin/shib.sh"]

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wordt dit niet gewoon overgeërfd uit de Apache2 container?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

en idem voor de PHP-famility hieronder?

CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
8 changes: 8 additions & 0 deletions apache2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,11 @@ EXPOSE 80
# Start Apache
ENTRYPOINT ["/entrypoint.sh"]
CMD ["apachectl", "-D", "FOREGROUND"]

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
15 changes: 15 additions & 0 deletions haproxy28/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
FROM haproxy:2.8

USER root
RUN apt-get update && \
apt-get install -y curl && \
rm -rf /var/lib/apt/lists/* \
USER haproxy

COPY conf/haproxy.pem /usr/local/etc/haproxy

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

8 changes: 8 additions & 0 deletions java21/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1,9 @@
FROM eclipse-temurin:21-jre-alpine
RUN apk add --no-cache curl
HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
8 changes: 8 additions & 0 deletions php72-apache2-node14-composer2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,11 @@ RUN mkdir /var/www/html/public

RUN rm -rf /etc/apache2/sites-enabled/*
COPY ./conf/appconf.conf /etc/apache2/sites-enabled/

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
8 changes: 8 additions & 0 deletions php72-apache2-node16-composer2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,11 @@ RUN mkdir /var/www/html/public

RUN rm -rf /etc/apache2/sites-enabled/*
COPY ./conf/appconf.conf /etc/apache2/sites-enabled/

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
8 changes: 8 additions & 0 deletions php72-apache2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,11 @@ EXPOSE 80
# Start Apache
ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"]

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
8 changes: 8 additions & 0 deletions php82-apache2-node20-composer2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,11 @@ RUN mkdir -p /var/www/html/public

RUN rm -rf /etc/apache2/sites-enabled/*
COPY ./conf/appconf.conf /etc/apache2/sites-enabled/

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
8 changes: 8 additions & 0 deletions php82-apache2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,3 +72,11 @@ EXPOSE 80
# Start Apache
ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"]

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
8 changes: 8 additions & 0 deletions php85-apache2-node24/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,11 @@ RUN mkdir -p /var/www/html/public

RUN rm -rf /etc/apache2/sites-enabled/*
COPY ./conf/appconf.conf /etc/apache2/sites-enabled/

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
8 changes: 8 additions & 0 deletions php85-apache2/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,3 +76,11 @@ EXPOSE 80
# Start Apache
ENTRYPOINT ["/entrypoint.sh"]
CMD ["apache2-foreground"]

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
12 changes: 12 additions & 0 deletions satosa/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
FROM docker.io/satosa:8
USER root:root
RUN apt-get update && \
apt-get install -y curl && \
rm -rf /var/lib/apt/lists/*

COPY ./conf/openconext-entrypoint.sh /usr/local/bin/

Expand All @@ -8,3 +12,11 @@ USER root:root

# https://stackoverflow.com/questions/47062854/custom-docker-image-doesnt-inherit-cmd/47063296#47063296
CMD ["gunicorn","-b0.0.0.0:8080","satosa.wsgi:app"]

HEALTHCHECK \
--start-period=30s \
--start-interval=1s \
--interval=10s \
--timeout=1s \
--retries=20 \
CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health