refactor: replace linkcheck with muffet
Some checks reported errors
continuous-integration/drone/pr Build encountered an error
Some checks reported errors
continuous-integration/drone/pr Build encountered an error
This commit is contained in:
parent
f642a43a92
commit
7167c193c4
20
.drone.yml
20
.drone.yml
@ -27,22 +27,6 @@ platform:
|
||||
arch: amd64
|
||||
|
||||
steps:
|
||||
- name: binary
|
||||
image: dart:stable
|
||||
commands:
|
||||
- apt-get -qq update && apt-get install -yqq --no-install-recommends make
|
||||
- make build
|
||||
environment:
|
||||
BUILD_VERSION: ${DRONE_TAG%-*}
|
||||
|
||||
- name: verify
|
||||
image: dart:stable
|
||||
commands:
|
||||
- src/build/linkcheck/linkcheck --help
|
||||
- src/build/linkcheck/linkcheck --version
|
||||
depends_on:
|
||||
- binary
|
||||
|
||||
- name: dryrun
|
||||
image: thegeeklab/drone-docker-buildx:20
|
||||
settings:
|
||||
@ -161,7 +145,7 @@ steps:
|
||||
DOCKER_USER:
|
||||
from_secret: docker_username
|
||||
PUSHRM_FILE: README.md
|
||||
PUSHRM_SHORT: Custom image for linkcheck
|
||||
PUSHRM_SHORT: Custom image for muffet
|
||||
PUSHRM_TARGET: thegeeklab/${DRONE_REPO_NAME}
|
||||
when:
|
||||
status:
|
||||
@ -209,6 +193,6 @@ depends_on:
|
||||
|
||||
---
|
||||
kind: signature
|
||||
hmac: 8746fe501b443c4f93f766414ef030b10c28cdc0cc19ca5984601c4bb5f98bf6
|
||||
hmac: 0d0e72a54efd88133e49e97ec2ac9eeb14335bbde9600f54015b1f812edd04d3
|
||||
|
||||
...
|
||||
|
@ -17,28 +17,31 @@ ENV CADDY_VERSION="${CADDY_VERSION:-v2.6.2}"
|
||||
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=github-releases depName=raviqqe/muffet
|
||||
ENV MUFFET_VERSION="${MUFFET_VERSION:-v2.6.1}"
|
||||
# renovate: datasource=git-tags depName=https://gitea.rknet.org/docker/container-library
|
||||
ENV CONTAINER_LIBRARY="${CONTAINER_LIBRARY:-v0.1.3}"
|
||||
|
||||
ENV LINK_VALIDATOR_BASE_DIR=/drone/src \
|
||||
LINK_VALIDATOR_SERVER_PORT=8000
|
||||
LINK_VALIDATOR_SERVER_PORT=8000 \
|
||||
LINK_VALIDATOR_RETRIES=0
|
||||
|
||||
COPY overlay/ /
|
||||
|
||||
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 "https://github.com/raviqqe/muffet/releases/download/${MUFFET_VERSION}/muffet_${MUFFET_VERSION##v}_Linux_x86_64.tar.gz" | tar xz -C /usr/local/bin muffet && \
|
||||
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/muffet && \
|
||||
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/
|
||||
|
||||
ADD src/build/linkcheck/linkcheck /usr/local/bin/linkcheck
|
||||
|
||||
USER root
|
||||
CMD []
|
||||
ENTRYPOINT ["/bin/link-validator"]
|
||||
|
29
Makefile
29
Makefile
@ -1,29 +0,0 @@
|
||||
# renovate: datasource=github-tags depName=filiph/linkcheck
|
||||
export BUILD_VERSION ?= 2.0.23
|
||||
export PATH := $(PATH):$(HOME)/.pub-cache/bin
|
||||
|
||||
SRC := src
|
||||
|
||||
.PHONY: all
|
||||
all: build
|
||||
|
||||
.PHONY: build
|
||||
build: build-src build-bin
|
||||
|
||||
.PHONY: build-src
|
||||
build-src:
|
||||
mkdir -p $(SRC); \
|
||||
curl -sSL "https://github.com/filiph/linkcheck/archive/$${BUILD_VERSION##v}.tar.gz" | tar xz -C $(SRC) --strip-components=1
|
||||
|
||||
.PHONY: build-bin
|
||||
build-bin:
|
||||
dart --disable-analytics --version; \
|
||||
cd $(SRC); \
|
||||
dart pub get; \
|
||||
dart pub global activate grinder; \
|
||||
grind pkg-standalone-linux-x64; \
|
||||
tar xzf build/linkcheck-*-linux-x64.tar.gz -C ./build
|
||||
|
||||
.PHONY: clean
|
||||
clean:
|
||||
rm -rf $(SRC)
|
@ -1,6 +1,6 @@
|
||||
# link-validator
|
||||
|
||||
Custom image for linkcheck
|
||||
Custom image for muffet
|
||||
|
||||
[![Build Status](https://img.shields.io/drone/build/docker/link-validator?logo=drone&server=https%3A%2F%2Fdrone.rknet.org)](https://drone.rknet.org/docker/link-validator)
|
||||
[![Docker Hub](https://img.shields.io/badge/dockerhub-latest-blue.svg?logo=docker&logoColor=white)](https://hub.docker.com/r/thegeeklab/link-validator)
|
||||
@ -8,15 +8,15 @@ Custom image for linkcheck
|
||||
[![Source: Gitea](https://img.shields.io/badge/source-gitea-blue.svg?logo=gitea&logoColor=white)](https://gitea.rknet.org/docker/link-validator)
|
||||
[![License: MIT](https://img.shields.io/badge/license-MIT-blue.svg)](https://gitea.rknet.org/docker/link-validator/src/branch/main/LICENSE)
|
||||
|
||||
Custom wrapper Docker image for [linkcheck](https://github.com/filiph/linkcheck/) optimized for CI.
|
||||
Custom wrapper Docker image for [muffet](https://github.com/raviqqe/muffet) optimized for CI.
|
||||
|
||||
## Usage
|
||||
|
||||
```Shell
|
||||
docker run -v $(pwd)/public:/drone/src link-validator
|
||||
|
||||
# or pass arguments to linkcheck
|
||||
# ... but DO NOT set the server url! This will be done automatically. See environment variables.
|
||||
# Pass arguments to muffet
|
||||
# ... but DO NOT set the server url! This is done automatically.
|
||||
docker run -v $(pwd)/public:/drone/src link-validator -e
|
||||
```
|
||||
|
||||
|
@ -12,5 +12,5 @@ caddy file-server --root "$LINK_VALIDATOR_BASE_DIR" --listen "$URL" &
|
||||
log_info "Wait for web server on '$URL'"
|
||||
/usr/local/bin/wait-for "$URL"
|
||||
|
||||
log_info "Start linkcheck"
|
||||
exec retry -t "${LINK_VALIDATOR_RETRIES:-0}" -- "/usr/local/bin/linkcheck $* $URL"
|
||||
log_info "Start muffet"
|
||||
exec retry -t "$LINK_VALIDATOR_RETRIES" -- "/usr/local/bin/muffet $* http://$URL"
|
||||
|
Reference in New Issue
Block a user