From de2c79696a0393f2b70bba5314e73627a530a9c8 Mon Sep 17 00:00:00 2001 From: Robert Kaussow Date: Wed, 2 Nov 2022 22:33:15 +0100 Subject: [PATCH] feat: add retry option --- Dockerfile | 4 ++++ README.md | 1 + overlay/bin/link-validator | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4ee93ce..8061de3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,6 +15,8 @@ ARG CONTAINER_LIBRARY ENV CADDY_VERSION="${CADDY_VERSION:-v2.6.2}" # renovate: datasource=github-releases depName=thegeeklab/wait-for ENV WAIT_FOR_VERSION="${WAIT_FOR_VERSION:-v0.2.0}" +# renovate: datasource=github-releases depName=thegeeklab/retry +ENV RETRY_VERSION="${RETRY_VERSION:-v0.3.0}" # renovate: datasource=git-tags depName=https://gitea.rknet.org/docker/container-library ENV CONTAINER_LIBRARY="${CONTAINER_LIBRARY:-v0.1.3}" @@ -27,8 +29,10 @@ RUN apt-get update && apt-get install -y curl bash ncat media-types && \ curl -SsfL "https://gitea.rknet.org/docker/container-library/releases/download/${CONTAINER_LIBRARY}/container-library.tar.gz" | tar xz -C / && \ curl -sSL "https://github.com/caddyserver/caddy/releases/download/${CADDY_VERSION}/caddy_${CADDY_VERSION##v}_linux_amd64.tar.gz" | tar xz -C /usr/local/bin caddy && \ curl -SsfL -o /usr/local/bin/wait-for "https://github.com/thegeeklab/wait-for/releases/download/${WAIT_FOR_VERSION}/wait-for" && \ + curl -SsfL -o /usr/local/bin/retry "https://github.com/thegeeklab/retry/releases/download/${RETRY_VERSION}/retry" && \ chmod 755 /usr/local/bin/caddy && \ chmod 755 /usr/local/bin/wait-for && \ + chmod 755 /usr/local/bin/retry && \ rm -rf /var/lib/apt/lists/* && \ rm -rf /tmp/* && \ rm -rf /root/.cache/ diff --git a/README.md b/README.md index cd798f0..d4aa328 100644 --- a/README.md +++ b/README.md @@ -25,6 +25,7 @@ docker run -v $(pwd)/public:/drone/src link-validator -e ```Shell LINK_VALIDATOR_BASE_DIR=/drone/src LINK_VALIDATOR_SERVER_PORT=8000 +LINK_VALIDATOR_RETRIES=0 ``` ## Build diff --git a/overlay/bin/link-validator b/overlay/bin/link-validator index bdd3ed3..23f2d96 100755 --- a/overlay/bin/link-validator +++ b/overlay/bin/link-validator @@ -13,4 +13,4 @@ log_info "Wait for web server on '$URL'" /usr/local/bin/wait-for "$URL" log_info "Start linkcheck" -exec /usr/local/bin/linkcheck "$@" "$URL" +exec retry -t "${LINK_VALIDATOR_RETRIES:-0}" -- /usr/local/bin/linkcheck "$@" "$URL"