Skip to content

Commit 1678597

Browse files
cytopiacytopia
authored
Merge pull request #10 from devilbox/makefile-lint
Let Docker detect arch
2 parents 1138af8 + 7ccbb91 commit 1678597

File tree

1 file changed

+17
-24
lines changed

1 file changed

+17
-24
lines changed

‎Makefile.lint‎

Lines changed: 17 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,6 @@ YL_VERSION = latest
2323
SC_IGNORES = .git/,.github/
2424
SC_VERSION = stable
2525

26-
# Ensure to use correct docker platform for linting images
27-
LINT_ARCH = linux/amd64
28-
ifeq ($(strip $(shell uname -m)),arm64)
29-
LINT_ARCH = linux/arm64
30-
endif
31-
32-
3326
# -------------------------------------------------------------------------------------------------
3427
# Lint Targets
3528
# -------------------------------------------------------------------------------------------------
@@ -46,12 +39,12 @@ lint-files:
4639
@echo "################################################################################"
4740
@echo "# Lint Files"
4841
@echo "################################################################################"
49-
@docker run --platform $(LINT_ARCH) --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-cr --text --ignore '$(FL_IGNORES)' --path .
50-
@docker run --platform $(LINT_ARCH) --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-crlf --text --ignore '$(FL_IGNORES)' --path .
51-
@docker run --platform $(LINT_ARCH) --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-trailing-single-newline --text --ignore '$(FL_IGNORES)' --path .
52-
@docker run --platform $(LINT_ARCH) --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-trailing-space --text --ignore '$(FL_IGNORES)' --path .
53-
@docker run --platform $(LINT_ARCH) --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-utf8 --text --ignore '$(FL_IGNORES)' --path .
54-
@docker run --platform $(LINT_ARCH) --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-utf8-bom --text --ignore '$(FL_IGNORES)' --path .
42+
@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-cr --text --ignore '$(FL_IGNORES)' --path .
43+
@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-crlf --text --ignore '$(FL_IGNORES)' --path .
44+
@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-trailing-single-newline --text --ignore '$(FL_IGNORES)' --path .
45+
@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-trailing-space --text --ignore '$(FL_IGNORES)' --path .
46+
@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-utf8 --text --ignore '$(FL_IGNORES)' --path .
47+
@docker run --rm $$(tty -s && echo "-it" || echo) -v $(CURRENT_DIR):/data cytopia/file-lint:$(FL_VERSION) file-utf8-bom --text --ignore '$(FL_IGNORES)' --path .
5548
@echo
5649

5750

@@ -61,7 +54,7 @@ lint-yaml:
6154
@echo "################################################################################"
6255
@echo "# Lint Yaml"
6356
@echo "################################################################################"
64-
@if docker run --platform $(LINT_ARCH) --rm $$(tty -s && echo "-it" || echo) -v "$(CURRENT_DIR):/data:ro" -w /data cytopia/yamllint:$(YL_VERSION) .; then \
57+
@if docker run --rm $$(tty -s && echo "-it" || echo) -v "$(CURRENT_DIR):/data:ro" -w /data cytopia/yamllint:$(YL_VERSION) .; then \
6558
echo "OK"; \
6659
else \
6760
echo "Failed"; \
@@ -76,7 +69,7 @@ lint-json:
7669
@echo "################################################################################"
7770
@echo "# Lint JSON"
7871
@echo "################################################################################"
79-
@if docker run --platform $(LINT_ARCH) --rm $$(tty -s && echo "-it" || echo) -v "$(CURRENT_DIR):/data:ro" -w /data cytopia/jsonlint:$(JL_VERSION) \
72+
@if docker run --rm $$(tty -s && echo "-it" || echo) -v "$(CURRENT_DIR):/data:ro" -w /data cytopia/jsonlint:$(JL_VERSION) \
8073
-t ' ' -i '$(JL_IGNORES)' '*.json'; then \
8174
echo "OK"; \
8275
else \
@@ -99,7 +92,7 @@ lint-bash:
9992
CMD="find . -name '*.sh' $${IGNORES} -print0"; \
10093
echo "$${CMD}"; \
10194
if [ "$$( eval "$${CMD}" )" != "" ]; then \
102-
eval "$${CMD}" | xargs -0 -n1 docker run --platform $(LINT_ARCH) --rm -v $(CURRENT_DIR):/data -w /data koalaman/shellcheck:$(SC_VERSION) --shell=bash; \
95+
eval "$${CMD}" | xargs -0 -n1 docker run --rm -v $(CURRENT_DIR):/data -w /data koalaman/shellcheck:$(SC_VERSION) --shell=bash; \
10396
fi
10497

10598

@@ -108,10 +101,10 @@ lint-bash:
108101
# -------------------------------------------------------------------------------------------------
109102
.PHONY: _lint-files-pull
110103
_lint-files-pull:
111-
@echo "Pulling cytopia/file-lint:$(FL_VERSION) ($(LINT_ARCH))"; \
104+
@echo "Pulling cytopia/file-lint:$(FL_VERSION)"; \
112105
SUCC=0; \
113106
for i in $$(seq 10); do \
114-
if docker pull -q --platform $(LINT_ARCH) cytopia/file-lint:$(FL_VERSION); then \
107+
if docker pull -q cytopia/file-lint:$(FL_VERSION); then \
115108
SUCC=1; \
116109
break; \
117110
fi; \
@@ -121,10 +114,10 @@ _lint-files-pull:
121114

122115
.PHONY: _lint-yaml-pull
123116
_lint-yaml-pull:
124-
@echo "Pulling cytopia/yamllint:$(YL_VERSION) ($(LINT_ARCH))"; \
117+
@echo "Pulling cytopia/yamllint:$(YL_VERSION)"; \
125118
SUCC=0; \
126119
for i in $$(seq 10); do \
127-
if docker pull -q --platform $(LINT_ARCH) cytopia/yamllint:$(YL_VERSION); then \
120+
if docker pull -q cytopia/yamllint:$(YL_VERSION); then \
128121
SUCC=1; \
129122
break; \
130123
fi; \
@@ -134,10 +127,10 @@ _lint-yaml-pull:
134127

135128
.PHONY: _lint-json-pull
136129
_lint-json-pull:
137-
@echo "Pulling cytopia/jsonlint:$(JL_VERSION) ($(LINT_ARCH))"; \
130+
@echo "Pulling cytopia/jsonlint:$(JL_VERSION)"; \
138131
SUCC=0; \
139132
for i in $$(seq 10); do \
140-
if docker pull -q --platform $(LINT_ARCH) cytopia/jsonlint:$(JL_VERSION); then \
133+
if docker pull -q cytopia/jsonlint:$(JL_VERSION); then \
141134
SUCC=1; \
142135
break; \
143136
fi; \
@@ -147,10 +140,10 @@ _lint-json-pull:
147140

148141
.PHONY: _lint-bash-pull
149142
_lint-bash-pull:
150-
@echo "Pulling koalaman/shellcheck:$(SC_VERSION) ($(LINT_ARCH))"; \
143+
@echo "Pulling koalaman/shellcheck:$(SC_VERSION)"; \
151144
SUCC=0; \
152145
for i in $$(seq 10); do \
153-
if docker pull -q --platform $(LINT_ARCH) koalaman/shellcheck:$(SC_VERSION); then \
146+
if docker pull -q koalaman/shellcheck:$(SC_VERSION); then \
154147
SUCC=1; \
155148
break; \
156149
fi; \

0 commit comments

Comments
 (0)