feat: add Caddy healthcheck and various cleanup (#462)
* feat: add Caddy healthcheck and various cleanup * fix healtcheck
This commit is contained in:
parent
8b40991b05
commit
81c2a77ed5
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
@ -68,7 +68,5 @@ jobs:
|
||||
name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
-
|
||||
name: Lint Dockerfiles
|
||||
name: Lint Dockerfile
|
||||
uses: hadolint/hadolint-action@v3.1.0
|
||||
with:
|
||||
recursive: true
|
||||
|
@ -47,11 +47,9 @@ COPY --link docker/php/php-fpm.d/zz-docker.conf /usr/local/etc/php-fpm.d/zz-dock
|
||||
RUN mkdir -p /var/run/php
|
||||
|
||||
COPY --link --chmod=755 docker/php/docker-healthcheck.sh /usr/local/bin/docker-healthcheck
|
||||
|
||||
HEALTHCHECK --interval=10s --timeout=3s --retries=3 --start-period=40s CMD ["docker-healthcheck"]
|
||||
HEALTHCHECK --start-period=1m CMD docker-healthcheck
|
||||
|
||||
COPY --link --chmod=755 docker/php/docker-entrypoint.sh /usr/local/bin/docker-entrypoint
|
||||
|
||||
ENTRYPOINT ["docker-entrypoint"]
|
||||
CMD ["php-fpm"]
|
||||
|
||||
@ -113,6 +111,7 @@ WORKDIR /srv/app
|
||||
ADD --chmod=500 https://caddyserver.com/api/download?os=linux&arch=$TARGETARCH&p=github.com/dunglas/mercure/caddy&p=github.com/dunglas/vulcain/caddy /usr/bin/caddy
|
||||
|
||||
COPY --link docker/caddy/Caddyfile /etc/caddy/Caddyfile
|
||||
HEALTHCHECK CMD wget --no-verbose --tries=1 --spider https://localhost/healthz || exit 1
|
||||
|
||||
# Prod Caddy image
|
||||
FROM caddy_base AS caddy_prod
|
||||
|
@ -1,15 +1,28 @@
|
||||
{
|
||||
# Debug
|
||||
{$CADDY_DEBUG}
|
||||
{$CADDY_GLOBAL_OPTIONS}
|
||||
}
|
||||
|
||||
{$SERVER_NAME}
|
||||
{$SERVER_NAME:localhost}
|
||||
|
||||
{$CADDY_EXTRA_CONFIG}
|
||||
|
||||
log
|
||||
log {
|
||||
# Redact the authorization query parameter that can be set by Mercure
|
||||
format filter {
|
||||
wrap console
|
||||
fields {
|
||||
uri query {
|
||||
replace authorization REDACTED
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
route {
|
||||
# Healthcheck URL
|
||||
respond /healthz 200
|
||||
skip_log /healthz
|
||||
|
||||
root * /srv/app/public
|
||||
mercure {
|
||||
# Transport to use (default to Bolt)
|
||||
@ -26,6 +39,7 @@ route {
|
||||
{$MERCURE_EXTRA_DIRECTIVES}
|
||||
}
|
||||
vulcain
|
||||
|
||||
php_fastcgi unix//var/run/php/php-fpm.sock
|
||||
encode zstd gzip
|
||||
file_server
|
||||
|
Loading…
x
Reference in New Issue
Block a user