Skip to content

Commit 41ceee5

Browse files
bdovazbdovaz
authored
Change clj-kondo installation from Docker image to installation script (#2368)
1 parent 787f295 commit 41ceee5

File tree

11 files changed

+95
-23
lines changed

11 files changed

+95
-23
lines changed

‎.automation/generated/flavors-stats.json

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1299,6 +1299,10 @@
12991299
[
13001300
"2023-02-16T01:07:41",
13011301
2778653
1302+
],
1303+
[
1304+
"2023-02-17T17:51:42",
1305+
2780933
13021306
]
13031307
],
13041308
"ci_light": [
@@ -2601,6 +2605,10 @@
26012605
[
26022606
"2023-02-16T01:07:41",
26032607
48142
2608+
],
2609+
[
2610+
"2023-02-17T17:51:42",
2611+
48449
26042612
]
26052613
],
26062614
"cupcake": [
@@ -2883,6 +2891,10 @@
28832891
[
28842892
"2023-02-16T01:07:41",
28852893
2834
2894+
],
2895+
[
2896+
"2023-02-17T17:51:42",
2897+
2897
28862898
]
28872899
],
28882900
"dart": [
@@ -5095,6 +5107,10 @@
50955107
[
50965108
"2023-02-16T01:07:41",
50975109
114610
5110+
],
5111+
[
5112+
"2023-02-17T17:51:42",
5113+
115387
50985114
]
50995115
],
51005116
"dotnet": [
@@ -6397,6 +6413,10 @@
63976413
[
63986414
"2023-02-16T01:07:41",
63996415
349110
6416+
],
6417+
[
6418+
"2023-02-17T17:51:42",
6419+
349522
64006420
]
64016421
],
64026422
"go": [
@@ -7699,6 +7719,10 @@
76997719
[
77007720
"2023-02-16T01:07:41",
77017721
16793
7722+
],
7723+
[
7724+
"2023-02-17T17:51:42",
7725+
16837
77027726
]
77037727
],
77047728
"java": [
@@ -9001,6 +9025,10 @@
90019025
[
90029026
"2023-02-16T01:07:41",
90039027
108751
9028+
],
9029+
[
9030+
"2023-02-17T17:51:42",
9031+
108949
90049032
]
90059033
],
90069034
"javascript": [
@@ -10303,6 +10331,10 @@
1030310331
[
1030410332
"2023-02-16T01:07:41",
1030510333
201057
10334+
],
10335+
[
10336+
"2023-02-17T17:51:42",
10337+
201991
1030610338
]
1030710339
],
1030810340
"php": [
@@ -11605,6 +11637,10 @@
1160511637
[
1160611638
"2023-02-16T01:07:41",
1160711639
45239
11640+
],
11641+
[
11642+
"2023-02-17T17:51:42",
11643+
45348
1160811644
]
1160911645
],
1161011646
"python": [
@@ -12907,6 +12943,10 @@
1290712943
[
1290812944
"2023-02-16T01:07:41",
1290912945
158821
12946+
],
12947+
[
12948+
"2023-02-17T17:51:42",
12949+
159537
1291012950
]
1291112951
],
1291212952
"ruby": [
@@ -14205,6 +14245,10 @@
1420514245
[
1420614246
"2023-02-16T01:07:41",
1420714247
2957
14248+
],
14249+
[
14250+
"2023-02-17T17:51:42",
14251+
2968
1420814252
]
1420914253
],
1421014254
"rust": [
@@ -15503,6 +15547,10 @@
1550315547
[
1550415548
"2023-02-16T01:07:41",
1550515549
4564
15550+
],
15551+
[
15552+
"2023-02-17T17:51:42",
15553+
4576
1550615554
]
1550715555
],
1550815556
"salesforce": [
@@ -16805,6 +16853,10 @@
1680516853
[
1680616854
"2023-02-16T01:07:41",
1680716855
16627
16856+
],
16857+
[
16858+
"2023-02-17T17:51:42",
16859+
16668
1680816860
]
1680916861
],
1681016862
"scala": [
@@ -18105,6 +18157,10 @@
1810518157
[
1810618158
"2023-02-16T01:07:41",
1810718159
2895
18160+
],
18161+
[
18162+
"2023-02-17T17:51:42",
18163+
2998
1810818164
]
1810918165
],
1811018166
"swift": [
@@ -19403,6 +19459,10 @@
1940319459
[
1940419460
"2023-02-16T01:07:41",
1940519461
3161
19462+
],
19463+
[
19464+
"2023-02-17T17:51:42",
19465+
3164
1940619466
]
1940719467
],
1940819468
"terraform": [
@@ -20705,6 +20765,10 @@
2070520765
[
2070620766
"2023-02-16T01:07:41",
2070720767
176969
20768+
],
20769+
[
20770+
"2023-02-17T17:51:42",
20771+
178103
2070820772
]
2070920773
]
2071020774
}

‎.automation/generated/linter-helps.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.automation/generated/linter-versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"checkstyle": "10.7.0",
1313
"chktex": "1.7.6",
1414
"clippy": "0.1.67",
15-
"clj-kondo": "2023.01.20",
15+
"clj-kondo": "2023.02.17",
1616
"coffeelint": "5.2.11",
1717
"cpplint": "1.6.1",
1818
"csharpier": "0.22.1",

‎CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ Note: Can be used with `oxsecurity/megalinter@beta` in your GitHub Action mega-l
9595
- [semgrep](https://semgrep.dev/) from 1.11.0 to **1.12.0** on 2023-02-16
9696
- [trivy](https://aquasecurity.github.io/trivy/) from 0.37.2 to **0.37.3** on 2023-02-16
9797
- [cspell](https://github.com/streetsidesoftware/cspell/tree/master/packages/cspell) from 6.24.0 to **6.26.1** on 2023-02-16
98+
- [clj-kondo](https://github.com/borkdude/clj-kondo) from 2023.01.20 to **2023.02.17** on 2023-02-17
9899
<!-- linter-versions-end -->
99100

100101
## [v6.19.0] - 2023-02-05

‎Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#############################################################################################
1212
#FROM__START
1313
FROM mvdan/shfmt:latest-alpine as shfmt
14-
FROM cljkondo/clj-kondo:2023.01.20-alpine as clj-kondo
1514
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
1615
FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker
1716
FROM ghcr.io/assignuser/chktex-alpine:latest as chktex
@@ -281,7 +280,6 @@ ENV PATH="/root/.cargo/bin:${PATH}"
281280

282281
#COPY__START
283282
COPY --from=shfmt /bin/shfmt /usr/bin/
284-
COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
285283
COPY --from=hadolint /bin/hadolint /usr/bin/hadolint
286284
COPY --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
287285
COPY --from=chktex /usr/bin/chktex /usr/bin/
@@ -412,7 +410,9 @@ RUN curl --retry 5 --retry-delay 5 -sLO "${ARM_TTK_URI}" \
412410
&& mv "${BICEP_EXE}" "${BICEP_DIR}" \
413411

414412
# clj-kondo installation
415-
# Managed with COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
413+
&& curl -sLO https://raw.githubusercontent.com/clj-kondo/clj-kondo/master/script/install-clj-kondo \
414+
&& chmod +x install-clj-kondo \
415+
&& ./install-clj-kondo \
416416

417417
# csharpier installation
418418
&& /usr/share/dotnet/dotnet tool install -g csharpier \

‎docs/all_linters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
| [**checkstyle**](https://github.com/checkstyle/checkstyle){target=_blank} | 10.7.0 | [LGPL-2.1](licenses/checkstyle.md) | [![GitHub stars](https://img.shields.io/github/stars/checkstyle/checkstyle?cacheSeconds=3600)](https://github.com/checkstyle/checkstyle){target=_blank} | [JAVA](descriptors/java_checkstyle.md) | :heart: | [MegaLinter reference](https://checkstyle.sourceforge.io/index.html#Related_Tools_Active_Tools){target=_blank} |
1919
| [**chktex**](https://www.nongnu.org/chktex){target=_blank} | 1.7.6 | <!-- --> | <!-- --> | [LATEX](descriptors/latex_chktex.md) | :white_circle: | [Web Site](https://www.nongnu.org/chktex){target=_blank} |
2020
| [**clippy**](https://github.com/rust-lang/rust-clippy){target=_blank} | 0.1.67 | [Other](licenses/clippy.md) | [![GitHub stars](https://img.shields.io/github/stars/rust-lang/rust-clippy?cacheSeconds=3600)](https://github.com/rust-lang/rust-clippy){target=_blank} | [RUST](descriptors/rust_clippy.md) | :white_circle: | [Repository](https://github.com/rust-lang/rust-clippy){target=_blank} |
21-
| [**clj-kondo**](https://github.com/borkdude/clj-kondo){target=_blank} | 2023.01.20 | [EPL-1.0](licenses/clj-kondo.md) | [![GitHub stars](https://img.shields.io/github/stars/borkdude/clj-kondo?cacheSeconds=3600)](https://github.com/borkdude/clj-kondo){target=_blank} | [CLOJURE](descriptors/clojure_clj_kondo.md) | :heart: | [MegaLinter reference](https://github.com/borkdude/clj-kondo/blob/master/doc/ci-integration.md#github){target=_blank} |
21+
| [**clj-kondo**](https://github.com/borkdude/clj-kondo){target=_blank} | 2023.02.17 | [EPL-1.0](licenses/clj-kondo.md) | [![GitHub stars](https://img.shields.io/github/stars/borkdude/clj-kondo?cacheSeconds=3600)](https://github.com/borkdude/clj-kondo){target=_blank} | [CLOJURE](descriptors/clojure_clj_kondo.md) | :heart: | [MegaLinter reference](https://github.com/borkdude/clj-kondo/blob/master/doc/ci-integration.md#github){target=_blank} |
2222
| [**coffeelint**](https://github.com/clutchski/coffeelint){target=_blank} | 5.2.11 | [Other](licenses/coffeelint.md) | [![GitHub stars](https://img.shields.io/github/stars/clutchski/coffeelint?cacheSeconds=3600)](https://github.com/clutchski/coffeelint){target=_blank} | [COFFEE](descriptors/coffee_coffeelint.md) | :white_circle: | [Repository](https://github.com/clutchski/coffeelint){target=_blank} |
2323
| [**cpplint**](https://github.com/cpplint/cpplint){target=_blank} | 1.6.1 | [Other](licenses/cpplint.md) | [![GitHub stars](https://img.shields.io/github/stars/cpplint/cpplint?cacheSeconds=3600)](https://github.com/cpplint/cpplint){target=_blank} | [C](descriptors/c_cpplint.md)<br/> [CPP](descriptors/cpp_cpplint.md) | :white_circle: | [Repository](https://github.com/cpplint/cpplint){target=_blank} |
2424
| [**csharpier**](https://github.com/belav/csharpier){target=_blank} | 0.22.1 | [MIT](licenses/csharpier.md) | [![GitHub stars](https://img.shields.io/github/stars/belav/csharpier?cacheSeconds=3600)](https://github.com/belav/csharpier){target=_blank} | [CSHARP](descriptors/csharp_csharpier.md) | :white_circle: | [Repository](https://github.com/belav/csharpier){target=_blank} |

‎docs/descriptors/clojure_clj_kondo.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ description: How to use clj-kondo (configure, ignore files, ignore errors, help
1515

1616
## clj-kondo documentation
1717

18-
- Version in MegaLinter: **2023.01.20**
18+
- Version in MegaLinter: **2023.02.17**
1919
- Visit [Official Web Site](https://github.com/borkdude/clj-kondo#readme){target=_blank}
2020
- See [How to configure clj-kondo rules](https://github.com/borkdude/clj-kondo/blob/master/doc/config.md#configuration){target=_blank}
2121
- If custom `.clj-kondo/config.edn` config file is not found, [.clj-kondo/config.edn](https://github.com/oxsecurity/megalinter/tree/main/TEMPLATES/.clj-kondo/config.edn){target=_blank} will be used
@@ -91,7 +91,7 @@ clj-kondo --lint --config .clj-kondo/config.edn myfile.clj
9191
### Help content
9292

9393
```shell
94-
clj-kondo v2023.01.20
94+
clj-kondo v2023.02.17
9595

9696

9797
Options:
@@ -114,7 +114,7 @@ Options:
114114
nearest `.clj-kondo` directory in the current and parent directories.
115115
116116
--config <config>: config may be a file or an EDN expression. See
117-
https://cljdoc.org/d/clj-kondo/clj-kondo/2023.01.20/doc/configuration
117+
https://cljdoc.org/d/clj-kondo/clj-kondo/2023.02.17/doc/configuration
118118
119119
--config-dir <config-dir>: use this config directory instead of auto-detected
120120
.clj-kondo dir.
@@ -138,7 +138,9 @@ Options:
138138
139139
- Dockerfile commands :
140140
```dockerfile
141-
FROM cljkondo/clj-kondo:2023.01.20-alpine as clj-kondo
142-
COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
141+
RUN curl -sLO https://raw.githubusercontent.com/clj-kondo/clj-kondo/master/script/install-clj-kondo \
142+
&& chmod +x install-clj-kondo \
143+
&& ./install-clj-kondo
144+
143145
```
144146

‎flavors/cupcake/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#############################################################################################
1313
#FROM__START
1414
FROM mvdan/shfmt:latest-alpine as shfmt
15-
FROM cljkondo/clj-kondo:2023.01.20-alpine as clj-kondo
1615
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
1716
FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker
1817
FROM zricethezav/gitleaks:v8.15.3 as gitleaks
@@ -243,7 +242,6 @@ ENV PATH="/root/.cargo/bin:${PATH}"
243242

244243
#COPY__START
245244
COPY --from=shfmt /bin/shfmt /usr/bin/
246-
COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
247245
COPY --from=hadolint /bin/hadolint /usr/bin/hadolint
248246
COPY --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
249247
COPY --from=gitleaks /usr/bin/gitleaks /usr/bin/
@@ -301,7 +299,9 @@ RUN go install github.com/rhysd/actionlint/cmd/actionlint@latest && go clean --c
301299
# Managed with COPY --from=shfmt /bin/shfmt /usr/bin/
302300

303301
# clj-kondo installation
304-
# Managed with COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
302+
&& curl -sLO https://raw.githubusercontent.com/clj-kondo/clj-kondo/master/script/install-clj-kondo \
303+
&& chmod +x install-clj-kondo \
304+
&& ./install-clj-kondo \
305305

306306
# hadolint installation
307307
# Managed with COPY --from=hadolint /bin/hadolint /usr/bin/hadolint

‎flavors/java/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
#############################################################################################
1313
#FROM__START
1414
FROM mvdan/shfmt:latest-alpine as shfmt
15-
FROM cljkondo/clj-kondo:2023.01.20-alpine as clj-kondo
1615
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
1716
FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker
1817
FROM yoheimuta/protolint:latest as protolint
@@ -193,7 +192,6 @@ ENV PATH="/root/.cargo/bin:${PATH}"
193192

194193
#COPY__START
195194
COPY --from=shfmt /bin/shfmt /usr/bin/
196-
COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
197195
COPY --from=hadolint /bin/hadolint /usr/bin/hadolint
198196
COPY --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
199197
COPY --from=protolint /usr/local/bin/protolint /usr/bin/
@@ -227,7 +225,9 @@ RUN go install github.com/rhysd/actionlint/cmd/actionlint@latest && go clean --c
227225
# Managed with COPY --from=shfmt /bin/shfmt /usr/bin/
228226

229227
# clj-kondo installation
230-
# Managed with COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
228+
&& curl -sLO https://raw.githubusercontent.com/clj-kondo/clj-kondo/master/script/install-clj-kondo \
229+
&& chmod +x install-clj-kondo \
230+
&& ./install-clj-kondo \
231231

232232
# hadolint installation
233233
# Managed with COPY --from=hadolint /bin/hadolint /usr/bin/hadolint

‎linters/clojure_clj_kondo/Dockerfile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
## @generated by .automation/build.py using descriptor files, please do not update manually ##
1111
#############################################################################################
1212
#FROM__START
13-
FROM cljkondo/clj-kondo:2023.01.20-alpine as clj-kondo
13+
1414
#FROM__END
1515

1616
##################
@@ -114,15 +114,18 @@ ENV PATH="/node-deps/node_modules/.bin:${PATH}" \
114114
#############################################################################################
115115

116116
#COPY__START
117-
COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
117+
118118
#COPY__END
119119

120120
#############################################################################################
121121
## @generated by .automation/build.py using descriptor files, please do not update manually ##
122122
#############################################################################################
123123
#OTHER__START
124124
# clj-kondo installation
125-
# Managed with COPY --from=clj-kondo /bin/clj-kondo /usr/bin/
125+
RUN curl -sLO https://raw.githubusercontent.com/clj-kondo/clj-kondo/master/script/install-clj-kondo \
126+
&& chmod +x install-clj-kondo \
127+
&& ./install-clj-kondo
128+
126129

127130
#OTHER__END
128131

0 commit comments

Comments
 (0)