Skip to content

Commit a4dfca6

Browse files
authored
Merge branch 'main' into dev/multi-platform-images
2 parents b9d01c1 + dcc2e19 commit a4dfca6

File tree

21 files changed

+125
-61
lines changed

21 files changed

+125
-61
lines changed

Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ FROM golang:1-alpine as revive
2626
## The install command should then be what is commented in the go.megalinter-descriptor.yml
2727
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
2828

29+
FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
2930
FROM ghcr.io/assignuser/chktex-alpine:latest as chktex
3031
FROM mrtazz/checkmake:latest as checkmake
3132
FROM ghcr.io/phpstan/phpstan:latest-php8.1 as phpstan
@@ -327,6 +328,7 @@ COPY --link --from=shfmt /bin/shfmt /usr/bin/
327328
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
328329
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
329330
COPY --link --from=revive /usr/bin/revive /usr/bin/revive
331+
COPY --link --from=kubeconform /kubeconform /usr/bin/
330332
COPY --link --from=chktex /usr/bin/chktex /usr/bin/
331333
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
332334
COPY --link --from=phpstan /composer/vendor/phpstan/phpstan/phpstan.phar /usr/bin/phpstan
@@ -619,7 +621,7 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P
619621
mv "ktlint" /usr/bin/ \
620622

621623
# kubeconform installation
622-
&& go install github.com/yannh/kubeconform/cmd/kubeconform@latest \
624+
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
623625

624626
# kubescape installation
625627
&& curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash \

flavors/cupcake/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ FROM golang:1-alpine as revive
2727
## The install command should then be what is commented in the go.megalinter-descriptor.yml
2828
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
2929

30+
FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
3031
FROM mrtazz/checkmake:latest as checkmake
3132
FROM ghcr.io/phpstan/phpstan:latest-php8.1 as phpstan
3233
FROM zricethezav/gitleaks:v8.16.3 as gitleaks
@@ -286,6 +287,7 @@ COPY --link --from=shfmt /bin/shfmt /usr/bin/
286287
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
287288
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
288289
COPY --link --from=revive /usr/bin/revive /usr/bin/revive
290+
COPY --link --from=kubeconform /kubeconform /usr/bin/
289291
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
290292
COPY --link --from=phpstan /composer/vendor/phpstan/phpstan/phpstan.phar /usr/bin/phpstan
291293
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
@@ -435,7 +437,7 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P
435437
mv "ktlint" /usr/bin/ \
436438

437439
# kubeconform installation
438-
&& go install github.com/yannh/kubeconform/cmd/kubeconform@latest \
440+
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
439441

440442
# kubescape installation
441443
&& curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash

flavors/documentation/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FROM koalaman/shellcheck:stable as shellcheck
2121
FROM mvdan/shfmt:latest-alpine as shfmt
2222
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
2323
FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker
24+
FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
2425
FROM mrtazz/checkmake:latest as checkmake
2526
FROM yoheimuta/protolint:latest as protolint
2627
FROM zricethezav/gitleaks:v8.16.3 as gitleaks
@@ -78,7 +79,6 @@ RUN apk add --update --no-cache \
7879
nodejs \
7980
npm \
8081
yarn \
81-
go \
8282
helm \
8383
gcompat \
8484
libc-dev \
@@ -226,6 +226,7 @@ COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
226226
COPY --link --from=shfmt /bin/shfmt /usr/bin/
227227
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
228228
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
229+
COPY --link --from=kubeconform /kubeconform /usr/bin/
229230
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
230231
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
231232
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
@@ -267,7 +268,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
267268
mv "ktlint" /usr/bin/ \
268269

269270
# kubeconform installation
270-
&& go install github.com/yannh/kubeconform/cmd/kubeconform@latest \
271+
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
271272

272273
# kubescape installation
273274
&& curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash \

flavors/dotnet/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FROM koalaman/shellcheck:stable as shellcheck
2121
FROM mvdan/shfmt:latest-alpine as shfmt
2222
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
2323
FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker
24+
FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
2425
FROM mrtazz/checkmake:latest as checkmake
2526
FROM yoheimuta/protolint:latest as protolint
2627
FROM zricethezav/gitleaks:v8.16.3 as gitleaks
@@ -94,7 +95,6 @@ RUN apk add --update --no-cache \
9495
nodejs \
9596
npm \
9697
yarn \
97-
go \
9898
helm \
9999
gcompat \
100100
libc-dev \
@@ -246,6 +246,7 @@ COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
246246
COPY --link --from=shfmt /bin/shfmt /usr/bin/
247247
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
248248
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
249+
COPY --link --from=kubeconform /kubeconform /usr/bin/
249250
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
250251
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
251252
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
@@ -359,7 +360,7 @@ esac \
359360
mv "ktlint" /usr/bin/ \
360361

361362
# kubeconform installation
362-
&& go install github.com/yannh/kubeconform/cmd/kubeconform@latest \
363+
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
363364

364365
# kubescape installation
365366
&& curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash \

flavors/go/Dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ FROM golang:1-alpine as revive
2727
## The install command should then be what is commented in the go.megalinter-descriptor.yml
2828
RUN GOBIN=/usr/bin go install github.com/mgechev/revive@latest
2929

30+
FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
3031
FROM mrtazz/checkmake:latest as checkmake
3132
FROM yoheimuta/protolint:latest as protolint
3233
FROM zricethezav/gitleaks:v8.16.3 as gitleaks
@@ -233,6 +234,7 @@ COPY --link --from=shfmt /bin/shfmt /usr/bin/
233234
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
234235
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
235236
COPY --link --from=revive /usr/bin/revive /usr/bin/revive
237+
COPY --link --from=kubeconform /kubeconform /usr/bin/
236238
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
237239
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
238240
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
@@ -281,7 +283,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
281283
mv "ktlint" /usr/bin/ \
282284

283285
# kubeconform installation
284-
&& go install github.com/yannh/kubeconform/cmd/kubeconform@latest \
286+
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
285287

286288
# kubescape installation
287289
&& curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash \

flavors/java/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FROM koalaman/shellcheck:stable as shellcheck
2121
FROM mvdan/shfmt:latest-alpine as shfmt
2222
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
2323
FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker
24+
FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
2425
FROM mrtazz/checkmake:latest as checkmake
2526
FROM yoheimuta/protolint:latest as protolint
2627
FROM zricethezav/gitleaks:v8.16.3 as gitleaks
@@ -78,7 +79,6 @@ RUN apk add --update --no-cache \
7879
nodejs \
7980
npm \
8081
yarn \
81-
go \
8282
helm \
8383
gcompat \
8484
libc-dev \
@@ -226,6 +226,7 @@ COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
226226
COPY --link --from=shfmt /bin/shfmt /usr/bin/
227227
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
228228
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
229+
COPY --link --from=kubeconform /kubeconform /usr/bin/
229230
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
230231
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
231232
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
@@ -343,7 +344,7 @@ RUN wget --quiet https://github.com/pmd/pmd/releases/download/pmd_releases%2F${P
343344
mv "ktlint" /usr/bin/ \
344345

345346
# kubeconform installation
346-
&& go install github.com/yannh/kubeconform/cmd/kubeconform@latest \
347+
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
347348

348349
# kubescape installation
349350
&& curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash \

flavors/javascript/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FROM koalaman/shellcheck:stable as shellcheck
2121
FROM mvdan/shfmt:latest-alpine as shfmt
2222
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
2323
FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker
24+
FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
2425
FROM yoheimuta/protolint:latest as protolint
2526
FROM zricethezav/gitleaks:v8.16.3 as gitleaks
2627
FROM jdkato/vale:latest as vale
@@ -77,7 +78,6 @@ RUN apk add --update --no-cache \
7778
nodejs \
7879
npm \
7980
yarn \
80-
go \
8181
helm \
8282
gcompat \
8383
libc-dev \
@@ -246,6 +246,7 @@ COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
246246
COPY --link --from=shfmt /bin/shfmt /usr/bin/
247247
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
248248
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
249+
COPY --link --from=kubeconform /kubeconform /usr/bin/
249250
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
250251
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
251252
COPY --link --from=vale /bin/vale /bin/vale
@@ -286,7 +287,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
286287
mv "ktlint" /usr/bin/ \
287288

288289
# kubeconform installation
289-
&& go install github.com/yannh/kubeconform/cmd/kubeconform@latest \
290+
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
290291

291292
# kubescape installation
292293
&& curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash \

flavors/php/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FROM koalaman/shellcheck:stable as shellcheck
2121
FROM mvdan/shfmt:latest-alpine as shfmt
2222
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
2323
FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker
24+
FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
2425
FROM ghcr.io/phpstan/phpstan:latest-php8.1 as phpstan
2526
FROM yoheimuta/protolint:latest as protolint
2627
FROM zricethezav/gitleaks:v8.16.3 as gitleaks
@@ -90,7 +91,6 @@ RUN apk add --update --no-cache \
9091
nodejs \
9192
npm \
9293
yarn \
93-
go \
9494
helm \
9595
gcompat \
9696
libc-dev \
@@ -238,6 +238,7 @@ COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
238238
COPY --link --from=shfmt /bin/shfmt /usr/bin/
239239
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
240240
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
241+
COPY --link --from=kubeconform /kubeconform /usr/bin/
241242
COPY --link --from=phpstan /composer/vendor/phpstan/phpstan/phpstan.phar /usr/bin/phpstan
242243
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
243244
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
@@ -297,7 +298,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
297298
mv "ktlint" /usr/bin/ \
298299

299300
# kubeconform installation
300-
&& go install github.com/yannh/kubeconform/cmd/kubeconform@latest \
301+
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
301302

302303
# kubescape installation
303304
&& curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash

flavors/python/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FROM koalaman/shellcheck:stable as shellcheck
2121
FROM mvdan/shfmt:latest-alpine as shfmt
2222
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
2323
FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker
24+
FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
2425
FROM mrtazz/checkmake:latest as checkmake
2526
FROM yoheimuta/protolint:latest as protolint
2627
FROM zricethezav/gitleaks:v8.16.3 as gitleaks
@@ -78,7 +79,6 @@ RUN apk add --update --no-cache \
7879
nodejs \
7980
npm \
8081
yarn \
81-
go \
8282
helm \
8383
gcompat \
8484
libc-dev \
@@ -237,6 +237,7 @@ COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
237237
COPY --link --from=shfmt /bin/shfmt /usr/bin/
238238
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
239239
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
240+
COPY --link --from=kubeconform /kubeconform /usr/bin/
240241
COPY --link --from=checkmake /checkmake /usr/bin/checkmake
241242
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
242243
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
@@ -278,7 +279,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
278279
mv "ktlint" /usr/bin/ \
279280

280281
# kubeconform installation
281-
&& go install github.com/yannh/kubeconform/cmd/kubeconform@latest \
282+
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
282283

283284
# kubescape installation
284285
&& curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash \

flavors/ruby/Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ FROM koalaman/shellcheck:stable as shellcheck
2121
FROM mvdan/shfmt:latest-alpine as shfmt
2222
FROM hadolint/hadolint:v2.12.0-alpine as hadolint
2323
FROM mstruebing/editorconfig-checker:2.7.0 as editorconfig-checker
24+
FROM ghcr.io/yannh/kubeconform:latest-alpine as kubeconform
2425
FROM yoheimuta/protolint:latest as protolint
2526
FROM zricethezav/gitleaks:v8.16.3 as gitleaks
2627
FROM jdkato/vale:latest as vale
@@ -77,7 +78,6 @@ RUN apk add --update --no-cache \
7778
nodejs \
7879
npm \
7980
yarn \
80-
go \
8181
helm \
8282
gcompat \
8383
libc-dev \
@@ -231,6 +231,7 @@ COPY --link --from=shellcheck /bin/shellcheck /usr/bin/shellcheck
231231
COPY --link --from=shfmt /bin/shfmt /usr/bin/
232232
COPY --link --from=hadolint /bin/hadolint /usr/bin/hadolint
233233
COPY --link --from=editorconfig-checker /usr/bin/ec /usr/bin/editorconfig-checker
234+
COPY --link --from=kubeconform /kubeconform /usr/bin/
234235
COPY --link --from=protolint /usr/local/bin/protolint /usr/bin/
235236
COPY --link --from=gitleaks /usr/bin/gitleaks /usr/bin/
236237
COPY --link --from=vale /bin/vale /bin/vale
@@ -271,7 +272,7 @@ RUN printf '#!/bin/bash \n\nif [[ -x "$1" ]]; then exit 0; else echo "Error: Fil
271272
mv "ktlint" /usr/bin/ \
272273

273274
# kubeconform installation
274-
&& go install github.com/yannh/kubeconform/cmd/kubeconform@latest \
275+
# Managed with COPY --link --from=kubeconform /kubeconform /usr/bin/
275276

276277
# kubescape installation
277278
&& curl --retry 5 --retry-delay 5 -sLv https://raw.githubusercontent.com/kubescape/kubescape/master/install.sh | /bin/bash \

0 commit comments

Comments
 (0)