Skip to content

Commit b64d968

Browse files
authored
Replace Docker image and versions with variables (hellt#22)
1 parent 06a028d commit b64d968

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

Makefile

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
.RECIPEPREFIX = >
22
VENV ?= .venv/bin/activate
33

4+
RUFF_IMG := ghcr.io/astral-sh/ruff
5+
RUFF_VER := 0.7.2
6+
MDLINT_IMG := davidanson/markdownlint-cli2
7+
MDLINT_VER := v0.14.0
8+
YAMLLINT_IMG := cytopia/yamllint
9+
YAMLLINT_VER := latest
10+
411
all: lint test
512
.PHONY: all
613

714
.PHONY: clean
815
clean:
9-
> @docker rmi ghcr.io/astral-sh/ruff:0.7.2 \
10-
> davidanson/markdownlint-cli2:v0.14.0 \
11-
> cytopia/yamllint
16+
> @docker rmi ${RUFF_IMG}:${RUFF_VER} \
17+
> ${MDLINT_IMG}:${MDLINT_VER} \
18+
> ${YAMLLINT_IMG}:${YAMLLINT_VER}
1219

1320
# run all the linting operations
1421
.PHONY: lint
@@ -19,14 +26,14 @@ lint: ruff mdlint yamllint
1926
# be disabled for the Docker bind mounts to function.
2027
.PHONY: mdlint
2128
mdlint:
22-
> @docker run --rm -v ${PWD}:/workdir davidanson/markdownlint-cli2:v0.14.0
29+
> @docker run --rm -v ${PWD}:/workdir ${MDLINT_IMG}:${MDLINT_VER}
2330

2431
# Python linting and formatting
2532
.PHONY: ruff
2633
ruff:
27-
> @docker run --rm -v ${PWD}:/workdir ghcr.io/astral-sh/ruff:0.7.2 \
34+
> @docker run --rm -v ${PWD}:/workdir ${RUFF_IMG}:${RUFF_VER} \
2835
> check /workdir
29-
> @docker run --rm -v ${PWD}:/workdir ghcr.io/astral-sh/ruff:0.7.2 \
36+
> @docker run --rm -v ${PWD}:/workdir ${RUFF_IMG}:${RUFF_VER} \
3037
> format --check --diff /workdir
3138

3239
# Python unit tests
@@ -37,7 +44,7 @@ test:
3744
# yaml linting
3845
.PHONY: yamllint
3946
yamllint:
40-
> @docker run --rm -v ${PWD}:/data cytopia/yamllint .
47+
> @docker run --rm -v ${PWD}:/data ${YAMLLINT_IMG}:${YAMLLINT_VER} .
4148

4249

4350
### LOCAL DEVELOPMENT ###

0 commit comments

Comments
 (0)